Touch up build ebuild and related files.

(Portage version: 2.0.51.22-r2)

4 files changed, 32 insertions, 5 deletions

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}