- Update to 3.0.5rc1

- New USE_RC_SUBR order
- Stop daemons on ports deinstall. (Add note in UPDATING about this)

PR:		ports/102489
Submitted by:	maintainer

3 files changed, 3 insertions, 56 deletions

diff --git a/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp3-server/files/isc-dhcpd.in
index 97e56f5f9b24..382cf789402c 100644
--- a/net/isc-dhcp3-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp3-server/files/isc-dhcpd.in
@@ -18,7 +18,7 @@ name=dhcpd
 paranoia=%%PARANOIA%%				# compiled in paranoia?
 jail=%%JAIL%%				# compiled in jail?
 
-load_rc_config $name
+load_rc_config ${name}
 
 # override these variables in /etc/rc.conf
 dhcpd_enable=${dhcpd_enable:-"NO"}
@@ -697,7 +697,7 @@ dhcpd_uninstall ()
 	fi
 }
 
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
 load_rc_config ${name}
 
 __dhcpd_uninstall="NO"			# internal use only
diff --git a/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp3-server/files/isc-dhcrelay.in
index 11c9b00b3133..db10841ff32a 100644
--- a/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp3-server/files/isc-dhcrelay.in
@@ -47,7 +47,7 @@ dhcrelay_precmd ()
 . %%RC_SUBR%%
 
 name=dhcrelay
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
 
 command=%%PREFIX%%/sbin/${name}
 pidfile=/var/run/${name}.pid
diff --git a/net/isc-dhcp3-server/files/patch-server::dhcp.c b/net/isc-dhcp3-server/files/patch-server::dhcp.c
deleted file mode 100644
index 94981458272e..000000000000
--- a/net/isc-dhcp3-server/files/patch-server::dhcp.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- server/dhcp.c.orig	Wed Feb 22 23:43:27 2006
-+++ server/dhcp.c	Mon May 22 01:39:59 2006
-@@ -2442,6 +2442,7 @@
- 		offered_lease_time =
- 			state -> offered_expiry - cur_time;
- 
-+		state -> expiry = 0;
- 		putULong ((unsigned char *)&state -> expiry,
- 			  (unsigned long)offered_lease_time);
- 		i = DHO_DHCP_LEASE_TIME;
-@@ -2452,7 +2453,7 @@
- 		if (option_cache_allocate (&oc, MDL)) {
- 			if (make_const_data (&oc -> expression,
- 					     (unsigned char *)&state -> expiry,
--					     sizeof state -> expiry,
-+					     4,
- 					     0, 0, MDL)) {
- 				oc -> option = dhcp_universe.options [i];
- 				save_option (&dhcp_universe,
-@@ -2463,6 +2464,7 @@
- 
- 		/* Renewal time is lease time * 0.5. */
- 		offered_lease_time /= 2;
-+		state -> renewal = 0;
- 		putULong ((unsigned char *)&state -> renewal,
- 			  (unsigned long)offered_lease_time);
- 		i = DHO_DHCP_RENEWAL_TIME;
-@@ -2474,7 +2476,7 @@
- 			if (make_const_data (&oc -> expression,
- 					     (unsigned char *)
- 					     &state -> renewal,
--					     sizeof state -> renewal,
-+					     4,
- 					     0, 0, MDL)) {
- 				oc -> option = dhcp_universe.options [i];
- 				save_option (&dhcp_universe,
-@@ -2486,6 +2488,7 @@
- 		/* Rebinding time is lease time * 0.875. */
- 		offered_lease_time += (offered_lease_time / 2
- 				       + offered_lease_time / 4);
-+		state -> rebind = 0;
- 		putULong ((unsigned char *)&state -> rebind,
- 			  (unsigned)offered_lease_time);
- 		i = DHO_DHCP_REBINDING_TIME;
-@@ -2496,7 +2499,7 @@
- 		if (option_cache_allocate (&oc, MDL)) {
- 			if (make_const_data (&oc -> expression,
- 					     (unsigned char *)&state -> rebind,
--					     sizeof state -> rebind,
-+					     4,
- 					     0, 0, MDL)) {
- 				oc -> option = dhcp_universe.options [i];
- 				save_option (&dhcp_universe,