Made this package support rc5/rc6 at the same time. Updated the profiles

inclusion masks to reflect this. Slightly tweaked the rc6 initscript
mostly with some additions as suggested on the gentoo-dev mailing list.

Renamed the cron stub in files, to be more indicative of what it is.
Thats about it..

7 files changed, 50 insertions, 52 deletions

diff --git a/sys-apps/sysklogd/files/digest-sysklogd-1.4-r2 b/sys-apps/sysklogd/files/digest-sysklogd-1.4-r6
index 648e989dc602..648e989dc602 100644
--- a/sys-apps/sysklogd/files/digest-sysklogd-1.4-r2
+++ b/sys-apps/sysklogd/files/digest-sysklogd-1.4-r6
diff --git a/sys-apps/sysklogd/files/sysklogd b/sys-apps/sysklogd/files/sysklogd.rc5
index 12632ecd5959..12632ecd5959 100755..100644
--- a/sys-apps/sysklogd/files/sysklogd
+++ b/sys-apps/sysklogd/files/sysklogd.rc5
diff --git a/sys-apps/sysklogd/files/sysklogd.rc6 b/sys-apps/sysklogd/files/sysklogd.rc6
index 499e92c7c516..411e629ceb92 100644
--- a/sys-apps/sysklogd/files/sysklogd.rc6
+++ b/sys-apps/sysklogd/files/sysklogd.rc6
@@ -1,25 +1,27 @@
 #!/sbin/runscript
-klog="/usr/sbin/klogd"
-slog="/usr/sbin/syslogd"
+
+SYSLOGD="-m 0"
+# send warnings and above to the console
+KLOGD="-c 3 -2"
 
 depend() {
-	need hostname
+    need hostname
 }
 
 start() {
     ebegin "Starting syslogd, klogd"
-    start-stop-daemon --start --exec $slog -- $SYSLOGD 1>&2
+    start-stop-daemon --start --quiet --exec /usr/sbin/syslogd -- ${SYSLOGD}
     retval=$?
-    start-stop-daemon --start --exec $klog -- $KLOGD 1>&2
+    start-stop-daemon --start --quiet --exec /usr/sbin/klogd -- ${KLOGD}
     retval=$(( $retval + $? ))
     eend $retval 
 }
 
 stop() {
     ebegin "Stopping klogd, syslogd"
-    start-stop-daemon --stop --pidfile /var/run/klogd.pid 1>&2
+    start-stop-daemon --stop --quiet --pidfile /var/run/klogd.pid
     retval=$?
-    start-stop-daemon --stop --pidfile /var/run/syslogd.pid 1>&2
+    start-stop-daemon --stop --quiet --pidfile /var/run/syslogd.pid
     retval=$(( $retval + $? ))
     eend $retval 
 }
diff --git a/sys-apps/sysklogd/files/syslog b/sys-apps/sysklogd/files/syslog-cron
index 6de232cf4f26..a8fe586b86a5 100755..100644
--- a/sys-apps/sysklogd/files/syslog
+++ b/sys-apps/sysklogd/files/syslog-cron
@@ -8,7 +8,7 @@
 #		stuff
 #
 #		Written by Martin Schulze <joey@debian.org>.
-#		$Id: syslog,v 1.1 2000/08/28 15:06:20 achim Exp $
+#		$Id: syslog-cron,v 1.1 2001/09/17 01:31:32 woodchip Exp $
 
 cd /var/log
 for LOG in `syslogd-listfiles -a`
diff --git a/sys-apps/sysklogd/sysklogd-1.4-r2.ebuild b/sys-apps/sysklogd/sysklogd-1.4-r2.ebuild
deleted file mode 100644
index 931bef64ffa1..000000000000
--- a/sys-apps/sysklogd/sysklogd-1.4-r2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Daniel Robbins <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/sysklogd-1.4-r2.ebuild,v 1.2 2001/08/07 18:07:12 darks Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="standard log daemons"
-SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${A}"
-
-DEPEND="virtual/glibc"
-RDEPEND="sys-devel/perl"
-
-src_unpack() {
-
-    unpack ${A}
-    cd ${S}
-    mv Makefile Makefile.orig
-    sed -e "s/-O3/${CFLAGS}/" Makefile.orig > Makefile
-
-}
-
-src_compile() {
-	try pmake LDFLAGS=""
-}
-
-src_install() {
-
-	dosbin syslogd klogd ${FILESDIR}/syslogd-listfiles
-	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
-
-        exeinto /etc/cron.daily
-        doexe ${FILESDIR}/syslog
-
-	dodoc ANNOUNCE CHANGES COPYING MANIFEST NEWS README.1st README.linux
-	exeinto /etc/rc.d/init.d
-	doexe ${FILESDIR}/sysklogd
-}
-
-
diff --git a/sys-apps/sysklogd/sysklogd-1.4-r3.ebuild b/sys-apps/sysklogd/sysklogd-1.4-r3.ebuild
index a4ddbd0e60de..5861bfdf180a 100644
--- a/sys-apps/sysklogd/sysklogd-1.4-r3.ebuild
+++ b/sys-apps/sysklogd/sysklogd-1.4-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Daniel Robbins <drobbins@gentoo.org>, Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/sysklogd-1.4-r3.ebuild,v 1.4 2001/09/14 05:11:15 lamer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/sysklogd-1.4-r3.ebuild,v 1.5 2001/09/17 01:31:32 woodchip Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Standard log daemons"
@@ -25,10 +25,11 @@ src_install() {
 	dosbin syslogd klogd ${FILESDIR}/syslogd-listfiles
 	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
 	exeinto /etc/cron.daily
-	doexe ${FILESDIR}/syslog
+	newexe ${FILESDIR}/syslog-cron syslog
 	dodoc ANNOUNCE CHANGES COPYING MANIFEST NEWS README.1st README.linux
-	exeinto /etc/init.d
-	doexe ${FILESDIR}/sysklogd
+	dodoc ${FILESDIR}/syslog.conf
 	insinto /etc
   	doins ${FILESDIR}/syslog.conf
+	exeinto /etc/rc.d/init.d
+	newexe ${FILESDIR}/sysklogd.rc5 sysklogd
 }
diff --git a/sys-apps/sysklogd/sysklogd-1.4-r6.ebuild b/sys-apps/sysklogd/sysklogd-1.4-r6.ebuild
new file mode 100644
index 000000000000..49502e49630d
--- /dev/null
+++ b/sys-apps/sysklogd/sysklogd-1.4-r6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author: Daniel Robbins <drobbins@gentoo.org>, Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sysklogd/sysklogd-1.4-r6.ebuild,v 1.1 2001/09/17 01:31:32 woodchip Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="Standard log daemons"
+SRC_URI="ftp://metalab.unc.edu/pub/Linux/system/daemons/${P}.tar.gz"
+
+DEPEND="virtual/glibc"
+RDEPEND="sys-devel/perl"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mv Makefile Makefile.orig
+	sed -e "s/-O3/${CFLAGS}/" Makefile.orig > Makefile
+}
+
+src_compile() {
+	emake LDFLAGS="" || die
+}
+
+src_install() {
+	dosbin syslogd klogd ${FILESDIR}/syslogd-listfiles
+	doman *.[1-9] ${FILESDIR}/syslogd-listfiles.8
+	exeinto /etc/cron.daily
+	newexe ${FILESDIR}/syslog-cron syslog
+	dodoc ANNOUNCE CHANGES COPYING MANIFEST NEWS README.1st README.linux
+	dodoc ${FILESDIR}/syslog.conf
+	insinto /etc
+  	doins ${FILESDIR}/syslog.conf
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/sysklogd.rc6 sysklogd
+}