[pkgsrc/trunk]: pkgsrc/net Leaf only updates for DHCP packages to get the sta...

[adrianp <adrianp%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/097caec90a31
branches:  trunk
changeset: 536950:097caec90a31
user:      adrianp <adrianp%pkgsrc.org@localhost>
date:      Sun Dec 30 12:30:52 2007 +0000

description:
Leaf only updates for DHCP packages to get the startup scripts working
and mirror the named9 package behaviour with rc.d

diffstat:

 net/isc-dhclient/Makefile          |   3 ++-
 net/isc-dhcp/files/isc_dhclient.sh |   8 ++++----
 net/isc-dhcp/files/isc_dhcpd.sh    |  11 ++++++-----
 net/isc-dhcp/files/isc_dhcrelay.sh |   6 +++---
 net/isc-dhcrelay/Makefile          |   3 ++-
 5 files changed, 17 insertions(+), 14 deletions(-)

diffs (123 lines):

diff -r 7b61cba21381 -r 097caec90a31 net/isc-dhclient/Makefile
--- a/net/isc-dhclient/Makefile Sun Dec 30 09:37:23 2007 +0000
+++ b/net/isc-dhclient/Makefile Sun Dec 30 12:30:52 2007 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/12/13 02:54:49 taca Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/30 12:30:53 adrianp Exp $
 #
 
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Client
 COMPONENT=     client
+PKGREVISION=   1
 SUBDIR=                client
 
 CONF_FILES+=   ${EGDIR}/dhclient.conf ${PKG_SYSCONFDIR}/dhclient.conf
diff -r 7b61cba21381 -r 097caec90a31 net/isc-dhcp/files/isc_dhclient.sh
--- a/net/isc-dhcp/files/isc_dhclient.sh        Sun Dec 30 09:37:23 2007 +0000
+++ b/net/isc-dhcp/files/isc_dhclient.sh        Sun Dec 30 12:30:52 2007 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: isc_dhclient.sh,v 1.1.1.1 2007/12/12 20:02:08 adrianp Exp $
+# $NetBSD: isc_dhclient.sh,v 1.2 2007/12/30 12:30:52 adrianp Exp $
 #
 
 # PROVIDE: dhclient
@@ -16,9 +16,9 @@
 fi
 
 name="dhclient"
-rcvar="isc_dhclient"
+rcvar="isc_${name}"
 command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/${name}.pid"
+pidfile="@VARBASE@/run/isc-dhcp/dhclient.pid"
 start_precmd="isc_dhclient_precmd"
 
 isc_dhclient_precmd()
@@ -29,5 +29,5 @@
        fi
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"
diff -r 7b61cba21381 -r 097caec90a31 net/isc-dhcp/files/isc_dhcpd.sh
--- a/net/isc-dhcp/files/isc_dhcpd.sh   Sun Dec 30 09:37:23 2007 +0000
+++ b/net/isc-dhcp/files/isc_dhcpd.sh   Sun Dec 30 12:30:52 2007 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: isc_dhcpd.sh,v 1.1.1.1 2007/12/12 20:02:08 adrianp Exp $
+# $NetBSD: isc_dhcpd.sh,v 1.2 2007/12/30 12:30:52 adrianp Exp $
 #
 
 # PROVIDE: dhcpd
@@ -12,10 +12,10 @@
 fi
 
 name="dhcpd"
-rcvar="isc_dhcpd"
+rcvar="isc_${name}"
 command="@PREFIX@/sbin/${name}"
-pidfile="@VARBASE@/run/isc-dhcp/${name}.pid"
-required_files="@PKG_SYSCONFDIR@/${name}.conf @DHCP_HOME@/${name}.leases"
+pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid"
+required_files="@PKG_SYSCONFDIR@/${name}.conf"
 start_precmd="isc_dhcpd_precmd"
 
 isc_dhcpd_precmd()
@@ -26,10 +26,11 @@
        fi
 
        if [ ! -f @DHCP_HOME@/dhcpd.leases ]; then
+               @MKDIR@ @DHCP_HOME@
                @TOUCH@ @DHCP_HOME@/dhcpd.leases
                @CHMOD@ 0640 @DHCP_HOME@/dhcpd.leases
        fi
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"
diff -r 7b61cba21381 -r 097caec90a31 net/isc-dhcp/files/isc_dhcrelay.sh
--- a/net/isc-dhcp/files/isc_dhcrelay.sh        Sun Dec 30 09:37:23 2007 +0000
+++ b/net/isc-dhcp/files/isc_dhcrelay.sh        Sun Dec 30 12:30:52 2007 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: isc_dhcrelay.sh,v 1.1.1.1 2007/12/12 20:02:08 adrianp Exp $
+# $NetBSD: isc_dhcrelay.sh,v 1.2 2007/12/30 12:30:52 adrianp Exp $
 #
 
 # PROVIDE: dhcrelay
@@ -16,7 +16,7 @@
 fi
 
 name="dhcrelay"
-rcvar="isc_dhcrelay"
+rcvar="isc_${name}"
 command="@PREFIX@/sbin/${name}"
 pidfile="@VARBASE@/run/isc-dhcp/${name}.pid"
 start_precmd="isc_dhcrelay_precmd"
@@ -29,5 +29,5 @@
        fi
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"
diff -r 7b61cba21381 -r 097caec90a31 net/isc-dhcrelay/Makefile
--- a/net/isc-dhcrelay/Makefile Sun Dec 30 09:37:23 2007 +0000
+++ b/net/isc-dhcrelay/Makefile Sun Dec 30 12:30:52 2007 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/12/13 02:54:49 taca Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/30 12:30:53 adrianp Exp $
 #
 
 COMMENT=       ISC Dynamic Host Configuration Protocol (DHCP) Relay
 COMPONENT=     relay
+PKGREVISION=   1
 SUBDIR=                relay
 
 RCD_SCRIPTS=   isc_dhcrelay