Touch up build ebuild and related files.

Package-Manager: portage-2.0.51.22-r2

7 files changed, 58 insertions, 43 deletions

diff --git a/sys-process/dcron/ChangeLog b/sys-process/dcron/ChangeLog
index 524b5a84621a..3c74288a9c09 100644
--- a/sys-process/dcron/ChangeLog
+++ b/sys-process/dcron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/dcron
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/ChangeLog,v 1.1 2005/03/04 23:42:58 ciaranm Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/ChangeLog,v 1.2 2005/09/06 04:43:32 vapier Exp $
+
+  06 Sep 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/dcron-2.9-EDITOR.patch, files/dcron-2.9-pidfile.patch,
+  -files/dcron-r4, +files/dcron.confd, +files/dcron.init,
+  dcron-2.9-r4.ebuild:
+  Touch up build ebuild and related files.
 
 *dcron-2.9-r4 (04 Mar 2005)
 
diff --git a/sys-process/dcron/Manifest b/sys-process/dcron/Manifest
index 00c69026977a..8ed5710b8865 100644
--- a/sys-process/dcron/Manifest
+++ b/sys-process/dcron/Manifest
@@ -3,22 +3,24 @@ Hash: SHA1
 
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
 MD5 5594f0ea9051ce81548f919346c1b9af dcron-2.9-r2.ebuild 2072
-MD5 13c4302dbda353bb9a99d35c521873c5 dcron-2.9-r4.ebuild 1655
-MD5 13b3ecf2d8c81f3d0568d5e69e8fa4ac ChangeLog 5904
+MD5 2cbcfd35b4602f1695869acf9e0b3013 dcron-2.9-r4.ebuild 1141
+MD5 d4d5d0fb6ad7be6439d562aa7ab07bdb ChangeLog 6142
+MD5 97ce907f092ad3c6917d9b0c4ccdc419 files/dcron-2.9-EDITOR.patch 634
 MD5 a82da32a58b097ea2ccd1b7a4aed72f3 files/dcron-2.9-ldflags.patch 590
 MD5 518d22de1cdd927de6c55ffb6a82bc46 files/crontab 823
-MD5 cd9a521d56c9c4df0fd79e9dd71bd32b files/dcron-2.9-pidfile.patch 493
+MD5 11c412642c8bf7caa068dfca3172802c files/dcron-2.9-pidfile.patch 437
+MD5 130e0a9c682f5241c8b67ddebf65e78b files/dcron.init 578
 MD5 2db10e843ecdf10a2b3aa5f70322310b files/digest-dcron-2.9-r4 55
-MD5 7df5f6298d06cc551243243ed5113c41 files/dcron-r4 528
 MD5 1de333010665696629a381be64dad25a files/dcron-2.9-Makefile.patch 629
 MD5 2db10e843ecdf10a2b3aa5f70322310b files/digest-dcron-2.9-r2 55
 MD5 577b9903a5bc13b51ed4e9a7e5d8b17e files/dcron.logrotate 36
+MD5 4a435e89f2e9035140abc23bbd8e05a9 files/dcron.confd 73
 MD5 8370eb8749f4f495ce31d315fc95abac files/dcron 611
 MD5 932978359b7a3b3a2d29a96827ceca83 files/dcron-2.7-Makefile-gentoo.diff 534
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDHRN2gIKl8Uu19MoRAiRfAJwKnzWA4Jcm0/oIPXuwoa2fkqeo1wCfRXkt
-fpBhVXbP5z8ROBCCJSg7aOo=
-=aac+
+iD8DBQFDHR6ngIKl8Uu19MoRAl+xAJ9cBaL+Lt6hJnsKbrXsKcyrnkmttgCfc5wB
+CftclL3EOc/5eEPSvFzxYwM=
+=qaAQ
 -----END PGP SIGNATURE-----
diff --git a/sys-process/dcron/dcron-2.9-r4.ebuild b/sys-process/dcron/dcron-2.9-r4.ebuild
index c634185da328..de7ad61d8541 100644
--- a/sys-process/dcron/dcron-2.9-r4.ebuild
+++ b/sys-process/dcron/dcron-2.9-r4.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/dcron-2.9-r4.ebuild,v 1.2 2005/09/06 03:55:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/dcron-2.9-r4.ebuild,v 1.3 2005/09/06 04:43:32 vapier Exp $
 
 inherit cron toolchain-funcs
 
-MY_PV=29
 DESCRIPTION="A cute little cron from Matt Dillon"
 HOMEPAGE="http://apollo.backplane.com/"
-SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${MY_PV}.tgz"
+SRC_URI="http://apollo.backplane.com/FreeSrc/${PN}${PV//.}.tgz"
 
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
@@ -23,46 +22,27 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}"/dcron-2.9-Makefile.patch
 	epatch "${FILESDIR}"/dcron-2.9-pidfile.patch
-
-	# fix 'crontab -e' to look at $EDITOR and not $VISUAL
-	sed -i 's:VISUAL:EDITOR:g' crontab.{c,1}
-
-	# remove gcc hardcode
-	sed -i "s:\(CC  = \)gcc:\1$(tc-getCC):" Makefile
+	epatch "${FILESDIR}"/dcron-2.9-EDITOR.patch
 }
 
 src_compile() {
-	make || die
+	emake CC=$(tc-getCC) || die
 }
 
 src_install() {
-	#this does not work if the directory already exists
 	docrondir
 	docron crond -m0700 -o root -g wheel
 	docrontab
 
-	dodoc CHANGELOG README ${FILESDIR}/crontab
+	dodoc CHANGELOG README "${FILESDIR}"/crontab
 	doman crontab.1 crond.8
 
-	newinitd ${FILESDIR}/dcron-r4 dcron
+	newinitd "${FILESDIR}"/dcron.init dcron
+	newconfd "${FILESDIR}"/dcron.confd dcron
 
 	insinto /etc/logrotate.d
-	newins ${FILESDIR}/dcron.logrotate dcron
+	newins "${FILESDIR}"/dcron.logrotate dcron
 
-	insopts -o root -g root -m 0644
 	insinto /etc
-	doins ${FILESDIR}/crontab
-}
-
-pkg_postinst() {
-	echo
-	einfo "To activate /etc/cron.{hourly|daily|weekly|montly} please run: "
-	einfo "crontab /etc/crontab"
-	echo
-	einfo "!!! That will replace root's current crontab !!!"
-	echo
-	einfo "You may wish to read the Gentoo Linux Cron Guide, which can be"
-	einfo "found online at:"
-	einfo "    http://www.gentoo.org/doc/en/cron-guide.xml"
-	echo
+	doins "${FILESDIR}"/crontab
 }
diff --git a/sys-process/dcron/files/dcron-2.9-EDITOR.patch b/sys-process/dcron/files/dcron-2.9-EDITOR.patch
new file mode 100644
index 000000000000..08c20bc0d13e
--- /dev/null
+++ b/sys-process/dcron/files/dcron-2.9-EDITOR.patch
@@ -0,0 +1,20 @@
+fix 'crontab -e' to look at $EDITOR and not $VISUAL
+
+--- crontab.1
++++ crontab.1
+@@ -27,5 +27,5 @@
+ specify a different user and/or crontab directory.  Generally the -e
+ option is used to edit your crontab.  crontab will use /usr/bin/vi or
+-the editor specified by your VISUAL environment variable to edit the
++the editor specified by your EDITOR environment variable to edit the
+ crontab.
+ .PP
+--- crontab.c
++++ crontab.c
+@@ -312,5 +312,5 @@
+ 	if (ChangeUser(user, 1) < 0)
+ 	    exit(0);
+-	if ((ptr = getenv("VISUAL")) == NULL || strlen(ptr) > 256)
++	if ((ptr = getenv("EDITOR")) == NULL || strlen(ptr) > 256)
+ 	    ptr = PATH_VI;
+ 
diff --git a/sys-process/dcron/files/dcron-2.9-pidfile.patch b/sys-process/dcron/files/dcron-2.9-pidfile.patch
index 61b009f399ae..ff74521ff173 100644
--- a/sys-process/dcron/files/dcron-2.9-pidfile.patch
+++ b/sys-process/dcron/files/dcron-2.9-pidfile.patch
@@ -1,5 +1,7 @@
---- dcron/main.c.orig	2005-02-19 15:19:13.000000000 -0500
-+++ dcron/main.c	2005-02-19 15:27:28.000000000 -0500
+Write out a pidfile
+
+--- dcron/main.c
++++ dcron/main.c
 @@ -122,8 +122,15 @@
              perror("fork");
              exit(1);
diff --git a/sys-process/dcron/files/dcron.confd b/sys-process/dcron/files/dcron.confd
new file mode 100644
index 000000000000..f895bd7013e3
--- /dev/null
+++ b/sys-process/dcron/files/dcron.confd
@@ -0,0 +1,4 @@
+# /etc/conf.d/dcron
+
+# Options to pass to dcron at startup
+DCRON_OPTS=""
diff --git a/sys-process/dcron/files/dcron-r4 b/sys-process/dcron/files/dcron.init
index fccf9154d3ce..841c7bc99170 100755
--- a/sys-process/dcron/files/dcron-r4
+++ b/sys-process/dcron/files/dcron.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/files/dcron-r4,v 1.2 2005/04/20 01:57:28 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/dcron/files/dcron.init,v 1.1 2005/09/06 04:43:32 vapier Exp $
 
 depend() {
 	use logger clock hostname
@@ -10,13 +10,14 @@ depend() {
 
 start() {
 	ebegin "Starting dcron"
-	/usr/sbin/crond >> /var/log/cron.log 2>&1
+	setsid /usr/sbin/crond ${DCRON_OPTS} >> /var/log/cron.log 2>&1
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping dcron"
-	start-stop-daemon --stop --quiet --pidfile /var/run/cron.pid
+	start-stop-daemon --stop --quiet \
+		--pidfile /var/run/cron.pid --exec /usr/sbin/crond
 	local ret=$?
 	rm -f /var/run/cron.pid
 	eend ${ret}