Leaf only updates for DHCP packages to get the startup scripts working

and mirror the named9 package behaviour with rc.d

5 files changed, 17 insertions, 14 deletions

diff --git a/net/isc-dhclient/Makefile b/net/isc-dhclient/Makefile
index f41822856c0..3ff8b33fc9c 100644
--- a/net/isc-dhclient/Makefile
+++ b/net/isc-dhclient/Makefile
@@ -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 --git a/net/isc-dhcp/files/isc_dhclient.sh b/net/isc-dhcp/files/isc_dhclient.sh
index 1f76834f9e6..4878e329df1 100755
--- a/net/isc-dhcp/files/isc_dhclient.sh
+++ b/net/isc-dhcp/files/isc_dhclient.sh
@@ -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 @@ if [ -f /etc/rc.subr ]; then
 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 @@ isc_dhclient_precmd()
 	fi
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"
diff --git a/net/isc-dhcp/files/isc_dhcpd.sh b/net/isc-dhcp/files/isc_dhcpd.sh
index 49b5662d48d..83eb33cdec3 100755
--- a/net/isc-dhcp/files/isc_dhcpd.sh
+++ b/net/isc-dhcp/files/isc_dhcpd.sh
@@ -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 @@ if [ -f /etc/rc.subr ]; then
 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 @@ isc_dhcpd_precmd()
 	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 --git a/net/isc-dhcp/files/isc_dhcrelay.sh b/net/isc-dhcp/files/isc_dhcrelay.sh
index 8d8ea273696..78d3236c648 100755
--- a/net/isc-dhcp/files/isc_dhcrelay.sh
+++ b/net/isc-dhcp/files/isc_dhcrelay.sh
@@ -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 @@ if [ -f /etc/rc.subr ]; then
 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 @@ isc_dhcrelay_precmd()
 	fi
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"
diff --git a/net/isc-dhcrelay/Makefile b/net/isc-dhcrelay/Makefile
index ed687298082..2af9467d5f4 100644
--- a/net/isc-dhcrelay/Makefile
+++ b/net/isc-dhcrelay/Makefile
@@ -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