aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Matveychuk <sem@FreeBSD.org>2006-08-25 12:02:58 +0000
committerSergey Matveychuk <sem@FreeBSD.org>2006-08-25 12:02:58 +0000
commit20b17ff3de68be1377183b71867b97cabf43f566 (patch)
tree1b0278e8aa695682cd7a38eb3d74fded8a1d85fa
parenteefc3f4c5f522cc50ee3dbaa35e271a73a804c0e (diff)
downloadports-20b17ff3de68be1377183b71867b97cabf43f566.tar.gz
ports-20b17ff3de68be1377183b71867b97cabf43f566.zip
Notes
-rw-r--r--UPDATING13
-rw-r--r--net/isc-dhcp3-relay/pkg-plist5
-rw-r--r--net/isc-dhcp3-server/Makefile41
-rw-r--r--net/isc-dhcp3-server/distinfo18
-rw-r--r--net/isc-dhcp3-server/files/isc-dhcpd.in (renamed from net/isc-dhcp3-server/files/isc-dhcpd.sh.sample)4
-rw-r--r--net/isc-dhcp3-server/files/isc-dhcrelay.in (renamed from net/isc-dhcp30-server/files/isc-dhcrelay.sh.sample)2
-rw-r--r--net/isc-dhcp3-server/files/patch-server::dhcp.c53
-rw-r--r--net/isc-dhcp3-server/pkg-install12
-rw-r--r--net/isc-dhcp3-server/pkg-plist3
-rw-r--r--net/isc-dhcp30-relay/pkg-plist5
-rw-r--r--net/isc-dhcp30-server/Makefile41
-rw-r--r--net/isc-dhcp30-server/distinfo18
-rw-r--r--net/isc-dhcp30-server/files/isc-dhcpd.in (renamed from net/isc-dhcp31-server/files/isc-dhcpd.sh.sample)4
-rw-r--r--net/isc-dhcp30-server/files/isc-dhcrelay.in (renamed from net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample)2
-rw-r--r--net/isc-dhcp30-server/files/patch-server::dhcp.c53
-rw-r--r--net/isc-dhcp30-server/pkg-install12
-rw-r--r--net/isc-dhcp30-server/pkg-plist3
-rw-r--r--net/isc-dhcp31-relay/pkg-plist5
-rw-r--r--net/isc-dhcp31-server/Makefile41
-rw-r--r--net/isc-dhcp31-server/distinfo18
-rw-r--r--net/isc-dhcp31-server/files/isc-dhcpd.in (renamed from net/isc-dhcp40-server/files/isc-dhcpd.sh.sample)4
-rw-r--r--net/isc-dhcp31-server/files/isc-dhcrelay.in (renamed from net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample)2
-rw-r--r--net/isc-dhcp31-server/files/patch-server::dhcp.c53
-rw-r--r--net/isc-dhcp31-server/pkg-install12
-rw-r--r--net/isc-dhcp31-server/pkg-plist3
-rw-r--r--net/isc-dhcp40-relay/pkg-plist5
-rw-r--r--net/isc-dhcp40-server/Makefile41
-rw-r--r--net/isc-dhcp40-server/distinfo18
-rw-r--r--net/isc-dhcp40-server/files/isc-dhcpd.in (renamed from net/isc-dhcp30-server/files/isc-dhcpd.sh.sample)4
-rw-r--r--net/isc-dhcp40-server/files/isc-dhcrelay.in (renamed from net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample)2
-rw-r--r--net/isc-dhcp40-server/files/patch-server::dhcp.c53
-rw-r--r--net/isc-dhcp40-server/pkg-install12
-rw-r--r--net/isc-dhcp40-server/pkg-plist3
33 files changed, 173 insertions, 392 deletions
diff --git a/UPDATING b/UPDATING
index a03a7c38446a..692352e23b3a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -9,6 +9,19 @@ upgrades.
20060818:
+ AFFECTS: users of net/isc-dhcp3-server or net/isc-dhcp3-relay
+ AUTHOR: Joerg.Pulz@frm2.tum.de
+
+ Starting with version 3.0.5rc1 of the ISC DHCPD package, any running
+ "dhcpd" or "dhcrelay" processes are stopped automatically when the port
+ gets deinstalled.
+ Please remember to start the services again manually, in case you upgrade
+ from version 3.0.5rc1 or newer to any other version.
+ Due to the better use of the USE_RC_SUBR framework, the rc script name may
+ change from isc-dhcpd.sh or isc-dhcrelay.sh to isc-dhcpd or isc-dhcrelay
+ depending on the FreeBSD version you use.
+
+20060818:
AFFECTS: users of www/gallery2
AUTHOR: miwi@FreeBSD.org
diff --git a/net/isc-dhcp3-relay/pkg-plist b/net/isc-dhcp3-relay/pkg-plist
index 7d8c6525100c..ecfe065c5cb0 100644
--- a/net/isc-dhcp3-relay/pkg-plist
+++ b/net/isc-dhcp3-relay/pkg-plist
@@ -1,3 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp3-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $
-etc/rc.d/isc-dhcrelay.sh
+@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp3-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
+@unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
+@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
sbin/dhcrelay
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 9bdf77dd2fbd..b3cb4ba3290a 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= dhcp
-PORTVERSION= 3.0.4
-PORTREVISION= 2
+PORTVERSION= 3.0.5.r1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@@ -19,8 +18,6 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= Joerg.Pulz@frm2.tum.de
COMMENT?= The ISC Dynamic Host Configuration Protocol server
-USE_RC_SUBR= yes
-
SUBSYS?= server
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -141,7 +138,7 @@ SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases
.elif ${SUBSYS} == server
BIN_FILES= dhcpd omshell
-RC_FILES= isc-dhcpd
+USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases
.if defined(WITH_DHCP_LDAP)
@@ -151,13 +148,12 @@ LDAP_SCHEMA= contrib/dhcp.schema
.endif
.elif ${SUBSYS} == relay
BIN_FILES= dhcrelay
-RC_FILES= isc-dhcrelay
+USE_RC_SUBR= isc-dhcrelay
.endif
SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc
-RC_DIR= ${PREFIX}/etc/rc.d
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
DATADIR= /var/db
@@ -169,21 +165,20 @@ PLIST_SUB+= LDAP=""
PLIST_SUB+= LDAP="@comment "
.endif
REINPLACE_SUB= PREFIX=${PREFIX}
-RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
.if ${OSVERSION} >= 502100
-RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin
+SUB_LIST+= NOLOGIN=/usr/sbin/nologin
.else
-RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin
+SUB_LIST+= NOLOGIN=/sbin/nologin
.endif
.if !defined(WITHOUT_DHCP_PARANOIA)
-RCSCRIPTS_SUB+= PARANOIA=YES
+SUB_LIST+= PARANOIA=YES
.else
-RCSCRIPTS_SUB+= PARANOIA=NO
+SUB_LIST+= PARANOIA=NO
.endif
.if !defined(WITHOUT_DHCP_JAIL)
-RCSCRIPTS_SUB+= JAIL=YES
+SUB_LIST+= JAIL=YES
.else
-RCSCRIPTS_SUB+= JAIL=NO
+SUB_LIST+= JAIL=NO
.endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
@@ -208,7 +203,7 @@ extract-script:
post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf \
- patch-rc-scripts patch-dlq
+ patch-dlq
patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -254,12 +249,6 @@ patch-makefiles-dist:
patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
-patch-rc-scripts:
-.for f in ${RC_FILES}
- @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
-.endfor
-
patch-pkgmessage:
.if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -283,12 +272,13 @@ patch-dlq:
# Post-install
#
-POST-INSTALL= parallel-post-install configure-package display-message
+POST-INSTALL= parallel-post-install install-rc-script configure-package \
+ display-message
.ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL}
parallel-post-install: \
- strip-binary-files install-startup-files \
+ strip-binary-files \
install-doc-files install-ldap-files install-sample-files \
create-conf-files create-data-files
@@ -302,11 +292,6 @@ strip-binary-files:
.endif
.endfor
-install-startup-files:
-.for f in ${RC_FILES}
- @${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
-.endfor
-
install-doc-files:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
diff --git a/net/isc-dhcp3-server/distinfo b/net/isc-dhcp3-server/distinfo
index 577496bd9e86..50e34e05f3c2 100644
--- a/net/isc-dhcp3-server/distinfo
+++ b/net/isc-dhcp3-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.4.tar.gz) = 004ef935fd54b8046b16bdde31a9e151
-SHA256 (dhcp-3.0.4.tar.gz) = 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7
-SIZE (dhcp-3.0.4.tar.gz) = 883245
-MD5 (dhcp-3.0.4-ldap-patch) = ad88faab5a2d134d7e96e9a984d6535b
-SHA256 (dhcp-3.0.4-ldap-patch) = e90aecfd57f4a60fb7775b72a73e637c8b481fea5c34956bf95bd0b39b1441be
-SIZE (dhcp-3.0.4-ldap-patch) = 154663
-MD5 (dhcp-3.0.4-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.4-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.4-dlq-patch) = 7655
+MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
+SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
+SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
+MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
+MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655
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-dhcp30-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp3-server/files/isc-dhcrelay.in
index 11c9b00b3133..db10841ff32a 100644
--- a/net/isc-dhcp30-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,
diff --git a/net/isc-dhcp3-server/pkg-install b/net/isc-dhcp3-server/pkg-install
index 8bafd2bed768..e620536d1cbd 100644
--- a/net/isc-dhcp3-server/pkg-install
+++ b/net/isc-dhcp3-server/pkg-install
@@ -9,10 +9,18 @@
case $2 in
POST-INSTALL)
- ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
+ if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
+ else
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
+ fi
;;
DEINSTALL)
- ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
+ if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
+ else
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
+ fi
;;
POST-DEINSTALL|PRE-INSTALL)
;;
diff --git a/net/isc-dhcp3-server/pkg-plist b/net/isc-dhcp3-server/pkg-plist
index 3daff57c0e42..e1028012ff4e 100644
--- a/net/isc-dhcp3-server/pkg-plist
+++ b/net/isc-dhcp3-server/pkg-plist
@@ -1,8 +1,9 @@
@comment $FreeBSD$
+@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
+@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap.pl
etc/dhcpd.conf.sample
-etc/rc.d/isc-dhcpd.sh
sbin/dhcpd
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
%%LDAP%%@dirrm %%SCHEMA_DIR%%
diff --git a/net/isc-dhcp30-relay/pkg-plist b/net/isc-dhcp30-relay/pkg-plist
index 0ec7154333a5..244e59402b9e 100644
--- a/net/isc-dhcp30-relay/pkg-plist
+++ b/net/isc-dhcp30-relay/pkg-plist
@@ -1,3 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp30-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $
-etc/rc.d/isc-dhcrelay.sh
+@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp30-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
+@unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
+@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
sbin/dhcrelay
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 9bdf77dd2fbd..b3cb4ba3290a 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= dhcp
-PORTVERSION= 3.0.4
-PORTREVISION= 2
+PORTVERSION= 3.0.5.r1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@@ -19,8 +18,6 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= Joerg.Pulz@frm2.tum.de
COMMENT?= The ISC Dynamic Host Configuration Protocol server
-USE_RC_SUBR= yes
-
SUBSYS?= server
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -141,7 +138,7 @@ SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases
.elif ${SUBSYS} == server
BIN_FILES= dhcpd omshell
-RC_FILES= isc-dhcpd
+USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases
.if defined(WITH_DHCP_LDAP)
@@ -151,13 +148,12 @@ LDAP_SCHEMA= contrib/dhcp.schema
.endif
.elif ${SUBSYS} == relay
BIN_FILES= dhcrelay
-RC_FILES= isc-dhcrelay
+USE_RC_SUBR= isc-dhcrelay
.endif
SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc
-RC_DIR= ${PREFIX}/etc/rc.d
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
DATADIR= /var/db
@@ -169,21 +165,20 @@ PLIST_SUB+= LDAP=""
PLIST_SUB+= LDAP="@comment "
.endif
REINPLACE_SUB= PREFIX=${PREFIX}
-RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
.if ${OSVERSION} >= 502100
-RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin
+SUB_LIST+= NOLOGIN=/usr/sbin/nologin
.else
-RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin
+SUB_LIST+= NOLOGIN=/sbin/nologin
.endif
.if !defined(WITHOUT_DHCP_PARANOIA)
-RCSCRIPTS_SUB+= PARANOIA=YES
+SUB_LIST+= PARANOIA=YES
.else
-RCSCRIPTS_SUB+= PARANOIA=NO
+SUB_LIST+= PARANOIA=NO
.endif
.if !defined(WITHOUT_DHCP_JAIL)
-RCSCRIPTS_SUB+= JAIL=YES
+SUB_LIST+= JAIL=YES
.else
-RCSCRIPTS_SUB+= JAIL=NO
+SUB_LIST+= JAIL=NO
.endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
@@ -208,7 +203,7 @@ extract-script:
post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf \
- patch-rc-scripts patch-dlq
+ patch-dlq
patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -254,12 +249,6 @@ patch-makefiles-dist:
patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
-patch-rc-scripts:
-.for f in ${RC_FILES}
- @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
-.endfor
-
patch-pkgmessage:
.if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -283,12 +272,13 @@ patch-dlq:
# Post-install
#
-POST-INSTALL= parallel-post-install configure-package display-message
+POST-INSTALL= parallel-post-install install-rc-script configure-package \
+ display-message
.ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL}
parallel-post-install: \
- strip-binary-files install-startup-files \
+ strip-binary-files \
install-doc-files install-ldap-files install-sample-files \
create-conf-files create-data-files
@@ -302,11 +292,6 @@ strip-binary-files:
.endif
.endfor
-install-startup-files:
-.for f in ${RC_FILES}
- @${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
-.endfor
-
install-doc-files:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
diff --git a/net/isc-dhcp30-server/distinfo b/net/isc-dhcp30-server/distinfo
index 577496bd9e86..50e34e05f3c2 100644
--- a/net/isc-dhcp30-server/distinfo
+++ b/net/isc-dhcp30-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.4.tar.gz) = 004ef935fd54b8046b16bdde31a9e151
-SHA256 (dhcp-3.0.4.tar.gz) = 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7
-SIZE (dhcp-3.0.4.tar.gz) = 883245
-MD5 (dhcp-3.0.4-ldap-patch) = ad88faab5a2d134d7e96e9a984d6535b
-SHA256 (dhcp-3.0.4-ldap-patch) = e90aecfd57f4a60fb7775b72a73e637c8b481fea5c34956bf95bd0b39b1441be
-SIZE (dhcp-3.0.4-ldap-patch) = 154663
-MD5 (dhcp-3.0.4-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.4-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.4-dlq-patch) = 7655
+MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
+SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
+SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
+MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
+MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655
diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp30-server/files/isc-dhcpd.in
index 97e56f5f9b24..382cf789402c 100644
--- a/net/isc-dhcp31-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp30-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-dhcp30-server/files/isc-dhcrelay.in
index 11c9b00b3133..db10841ff32a 100644
--- a/net/isc-dhcp3-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp30-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-dhcp30-server/files/patch-server::dhcp.c b/net/isc-dhcp30-server/files/patch-server::dhcp.c
deleted file mode 100644
index 94981458272e..000000000000
--- a/net/isc-dhcp30-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,
diff --git a/net/isc-dhcp30-server/pkg-install b/net/isc-dhcp30-server/pkg-install
index 8bafd2bed768..e620536d1cbd 100644
--- a/net/isc-dhcp30-server/pkg-install
+++ b/net/isc-dhcp30-server/pkg-install
@@ -9,10 +9,18 @@
case $2 in
POST-INSTALL)
- ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
+ if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
+ else
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
+ fi
;;
DEINSTALL)
- ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
+ if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
+ else
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
+ fi
;;
POST-DEINSTALL|PRE-INSTALL)
;;
diff --git a/net/isc-dhcp30-server/pkg-plist b/net/isc-dhcp30-server/pkg-plist
index 3daff57c0e42..e1028012ff4e 100644
--- a/net/isc-dhcp30-server/pkg-plist
+++ b/net/isc-dhcp30-server/pkg-plist
@@ -1,8 +1,9 @@
@comment $FreeBSD$
+@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
+@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap.pl
etc/dhcpd.conf.sample
-etc/rc.d/isc-dhcpd.sh
sbin/dhcpd
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
%%LDAP%%@dirrm %%SCHEMA_DIR%%
diff --git a/net/isc-dhcp31-relay/pkg-plist b/net/isc-dhcp31-relay/pkg-plist
index fc8db48c3d96..1e66232a86cc 100644
--- a/net/isc-dhcp31-relay/pkg-plist
+++ b/net/isc-dhcp31-relay/pkg-plist
@@ -1,3 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $
-etc/rc.d/isc-dhcrelay.sh
+@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp31-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
+@unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
+@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
sbin/dhcrelay
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 9bdf77dd2fbd..b3cb4ba3290a 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= dhcp
-PORTVERSION= 3.0.4
-PORTREVISION= 2
+PORTVERSION= 3.0.5.r1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@@ -19,8 +18,6 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= Joerg.Pulz@frm2.tum.de
COMMENT?= The ISC Dynamic Host Configuration Protocol server
-USE_RC_SUBR= yes
-
SUBSYS?= server
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -141,7 +138,7 @@ SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases
.elif ${SUBSYS} == server
BIN_FILES= dhcpd omshell
-RC_FILES= isc-dhcpd
+USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases
.if defined(WITH_DHCP_LDAP)
@@ -151,13 +148,12 @@ LDAP_SCHEMA= contrib/dhcp.schema
.endif
.elif ${SUBSYS} == relay
BIN_FILES= dhcrelay
-RC_FILES= isc-dhcrelay
+USE_RC_SUBR= isc-dhcrelay
.endif
SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc
-RC_DIR= ${PREFIX}/etc/rc.d
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
DATADIR= /var/db
@@ -169,21 +165,20 @@ PLIST_SUB+= LDAP=""
PLIST_SUB+= LDAP="@comment "
.endif
REINPLACE_SUB= PREFIX=${PREFIX}
-RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
.if ${OSVERSION} >= 502100
-RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin
+SUB_LIST+= NOLOGIN=/usr/sbin/nologin
.else
-RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin
+SUB_LIST+= NOLOGIN=/sbin/nologin
.endif
.if !defined(WITHOUT_DHCP_PARANOIA)
-RCSCRIPTS_SUB+= PARANOIA=YES
+SUB_LIST+= PARANOIA=YES
.else
-RCSCRIPTS_SUB+= PARANOIA=NO
+SUB_LIST+= PARANOIA=NO
.endif
.if !defined(WITHOUT_DHCP_JAIL)
-RCSCRIPTS_SUB+= JAIL=YES
+SUB_LIST+= JAIL=YES
.else
-RCSCRIPTS_SUB+= JAIL=NO
+SUB_LIST+= JAIL=NO
.endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
@@ -208,7 +203,7 @@ extract-script:
post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf \
- patch-rc-scripts patch-dlq
+ patch-dlq
patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -254,12 +249,6 @@ patch-makefiles-dist:
patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
-patch-rc-scripts:
-.for f in ${RC_FILES}
- @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
-.endfor
-
patch-pkgmessage:
.if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -283,12 +272,13 @@ patch-dlq:
# Post-install
#
-POST-INSTALL= parallel-post-install configure-package display-message
+POST-INSTALL= parallel-post-install install-rc-script configure-package \
+ display-message
.ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL}
parallel-post-install: \
- strip-binary-files install-startup-files \
+ strip-binary-files \
install-doc-files install-ldap-files install-sample-files \
create-conf-files create-data-files
@@ -302,11 +292,6 @@ strip-binary-files:
.endif
.endfor
-install-startup-files:
-.for f in ${RC_FILES}
- @${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
-.endfor
-
install-doc-files:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
diff --git a/net/isc-dhcp31-server/distinfo b/net/isc-dhcp31-server/distinfo
index 577496bd9e86..50e34e05f3c2 100644
--- a/net/isc-dhcp31-server/distinfo
+++ b/net/isc-dhcp31-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.4.tar.gz) = 004ef935fd54b8046b16bdde31a9e151
-SHA256 (dhcp-3.0.4.tar.gz) = 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7
-SIZE (dhcp-3.0.4.tar.gz) = 883245
-MD5 (dhcp-3.0.4-ldap-patch) = ad88faab5a2d134d7e96e9a984d6535b
-SHA256 (dhcp-3.0.4-ldap-patch) = e90aecfd57f4a60fb7775b72a73e637c8b481fea5c34956bf95bd0b39b1441be
-SIZE (dhcp-3.0.4-ldap-patch) = 154663
-MD5 (dhcp-3.0.4-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.4-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.4-dlq-patch) = 7655
+MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
+SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
+SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
+MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
+MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655
diff --git a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp31-server/files/isc-dhcpd.in
index 97e56f5f9b24..382cf789402c 100644
--- a/net/isc-dhcp40-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp31-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-dhcp31-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp31-server/files/isc-dhcrelay.in
index 11c9b00b3133..db10841ff32a 100644
--- a/net/isc-dhcp31-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp31-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-dhcp31-server/files/patch-server::dhcp.c b/net/isc-dhcp31-server/files/patch-server::dhcp.c
deleted file mode 100644
index 94981458272e..000000000000
--- a/net/isc-dhcp31-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,
diff --git a/net/isc-dhcp31-server/pkg-install b/net/isc-dhcp31-server/pkg-install
index 8bafd2bed768..e620536d1cbd 100644
--- a/net/isc-dhcp31-server/pkg-install
+++ b/net/isc-dhcp31-server/pkg-install
@@ -9,10 +9,18 @@
case $2 in
POST-INSTALL)
- ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
+ if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
+ else
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
+ fi
;;
DEINSTALL)
- ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
+ if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
+ else
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
+ fi
;;
POST-DEINSTALL|PRE-INSTALL)
;;
diff --git a/net/isc-dhcp31-server/pkg-plist b/net/isc-dhcp31-server/pkg-plist
index 3daff57c0e42..e1028012ff4e 100644
--- a/net/isc-dhcp31-server/pkg-plist
+++ b/net/isc-dhcp31-server/pkg-plist
@@ -1,8 +1,9 @@
@comment $FreeBSD$
+@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
+@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap.pl
etc/dhcpd.conf.sample
-etc/rc.d/isc-dhcpd.sh
sbin/dhcpd
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
%%LDAP%%@dirrm %%SCHEMA_DIR%%
diff --git a/net/isc-dhcp40-relay/pkg-plist b/net/isc-dhcp40-relay/pkg-plist
index 4e31ff1c9fd7..d0182db32a9c 100644
--- a/net/isc-dhcp40-relay/pkg-plist
+++ b/net/isc-dhcp40-relay/pkg-plist
@@ -1,3 +1,4 @@
-@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp40-relay/Attic/pkg-plist,v 1.4 2004-06-26 08:46:05 eik Exp $
-etc/rc.d/isc-dhcrelay.sh
+@comment $FreeBSD: /tmp/pcvs/ports/net/isc-dhcp40-relay/Attic/pkg-plist,v 1.5 2006-08-25 12:02:58 sem Exp $
+@unexec %D/etc/rc.d/isc-dhcrelay.sh forcestop 2>/dev/null || true
+@unexec %D/etc/rc.d/isc-dhcrelay forcestop 2>/dev/null || true
sbin/dhcrelay
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 9bdf77dd2fbd..b3cb4ba3290a 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -7,8 +7,7 @@
#
PORTNAME= dhcp
-PORTVERSION= 3.0.4
-PORTREVISION= 2
+PORTVERSION= 3.0.5.r1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_ISC}
MASTER_SITE_SUBDIR= dhcp dhcp/dhcp-3.0-history
@@ -19,8 +18,6 @@ DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL}
MAINTAINER= Joerg.Pulz@frm2.tum.de
COMMENT?= The ISC Dynamic Host Configuration Protocol server
-USE_RC_SUBR= yes
-
SUBSYS?= server
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
@@ -141,7 +138,7 @@ SAMP_FILES= client/dhclient.conf
DATA_FILES= dhclient.leases
.elif ${SUBSYS} == server
BIN_FILES= dhcpd omshell
-RC_FILES= isc-dhcpd
+USE_RC_SUBR= isc-dhcpd
SAMP_FILES= server/dhcpd.conf
DATA_FILES= dhcpd.leases
.if defined(WITH_DHCP_LDAP)
@@ -151,13 +148,12 @@ LDAP_SCHEMA= contrib/dhcp.schema
.endif
.elif ${SUBSYS} == relay
BIN_FILES= dhcrelay
-RC_FILES= isc-dhcrelay
+USE_RC_SUBR= isc-dhcrelay
.endif
SAMP_SUFX= .sample
CONF_DIR= ${PREFIX}/etc
-RC_DIR= ${PREFIX}/etc/rc.d
SCHEMA_DIR= ${PREFIX}/share/${PKGBASE}
DOCSDIR= ${PREFIX}/share/doc/${PKGBASE}
DATADIR= /var/db
@@ -169,21 +165,20 @@ PLIST_SUB+= LDAP=""
PLIST_SUB+= LDAP="@comment "
.endif
REINPLACE_SUB= PREFIX=${PREFIX}
-RCSCRIPTS_SUB= PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
.if ${OSVERSION} >= 502100
-RCSCRIPTS_SUB+= NOLOGIN=/usr/sbin/nologin
+SUB_LIST+= NOLOGIN=/usr/sbin/nologin
.else
-RCSCRIPTS_SUB+= NOLOGIN=/sbin/nologin
+SUB_LIST+= NOLOGIN=/sbin/nologin
.endif
.if !defined(WITHOUT_DHCP_PARANOIA)
-RCSCRIPTS_SUB+= PARANOIA=YES
+SUB_LIST+= PARANOIA=YES
.else
-RCSCRIPTS_SUB+= PARANOIA=NO
+SUB_LIST+= PARANOIA=NO
.endif
.if !defined(WITHOUT_DHCP_JAIL)
-RCSCRIPTS_SUB+= JAIL=YES
+SUB_LIST+= JAIL=YES
.else
-RCSCRIPTS_SUB+= JAIL=NO
+SUB_LIST+= JAIL=NO
.endif
PKGMESSAGE_SUB= PREFIX="${PREFIX}" MAN1PREFIX="${MAN1PREFIX}" \
DOCSDIR="${DOCSDIR}" SCHEMA_DIR="${SCHEMA_DIR}"
@@ -208,7 +203,7 @@ extract-script:
post-patch: patch-scripts patch-makefile-conf \
patch-makefiles-dist patch-man-pages \
patch-pkgmessage patch-site-conf \
- patch-rc-scripts patch-dlq
+ patch-dlq
patch-scripts:
@${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -254,12 +249,6 @@ patch-makefiles-dist:
patch-man-pages:
@${REINPLACE_CMD} -e '/^\.Fd$$/d' ${WRKSRC}/dhcpctl/dhcpctl.3
-patch-rc-scripts:
-.for f in ${RC_FILES}
- @${SED} ${RCSCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
- ${FILESDIR}/${f}.sh${SAMP_SUFX} > ${WRKDIR}/${f}.sh
-.endfor
-
patch-pkgmessage:
.if ${SUBSYS} != devel
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
@@ -283,12 +272,13 @@ patch-dlq:
# Post-install
#
-POST-INSTALL= parallel-post-install configure-package display-message
+POST-INSTALL= parallel-post-install install-rc-script configure-package \
+ display-message
.ORDER: ${POST-INSTALL}
post-install: ${POST-INSTALL}
parallel-post-install: \
- strip-binary-files install-startup-files \
+ strip-binary-files \
install-doc-files install-ldap-files install-sample-files \
create-conf-files create-data-files
@@ -302,11 +292,6 @@ strip-binary-files:
.endif
.endfor
-install-startup-files:
-.for f in ${RC_FILES}
- @${INSTALL_SCRIPT} ${WRKDIR}/${f}.sh ${RC_DIR}
-.endfor
-
install-doc-files:
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo
index 577496bd9e86..50e34e05f3c2 100644
--- a/net/isc-dhcp40-server/distinfo
+++ b/net/isc-dhcp40-server/distinfo
@@ -1,9 +1,9 @@
-MD5 (dhcp-3.0.4.tar.gz) = 004ef935fd54b8046b16bdde31a9e151
-SHA256 (dhcp-3.0.4.tar.gz) = 89171155b7a9225f5eb81c83ff63f071168b87eacab05fb859b8397d36809bf7
-SIZE (dhcp-3.0.4.tar.gz) = 883245
-MD5 (dhcp-3.0.4-ldap-patch) = ad88faab5a2d134d7e96e9a984d6535b
-SHA256 (dhcp-3.0.4-ldap-patch) = e90aecfd57f4a60fb7775b72a73e637c8b481fea5c34956bf95bd0b39b1441be
-SIZE (dhcp-3.0.4-ldap-patch) = 154663
-MD5 (dhcp-3.0.4-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
-SHA256 (dhcp-3.0.4-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
-SIZE (dhcp-3.0.4-dlq-patch) = 7655
+MD5 (dhcp-3.0.5rc1.tar.gz) = 0e2769a9a883f41c5130f2d3cbbf3a21
+SHA256 (dhcp-3.0.5rc1.tar.gz) = b46d94db0c74c8f42c35bc98bec2fac7bcb431b2082f3e8f2541bd5a422e0218
+SIZE (dhcp-3.0.5rc1.tar.gz) = 882983
+MD5 (dhcp-3.0.5rc1-ldap-patch) = 53d4e9c657283e4018e68521b35c6a7a
+SHA256 (dhcp-3.0.5rc1-ldap-patch) = 406a8e19fc8407385c350f0f09075721ac0cea342c7ff7fe21d83d68f15c7dc9
+SIZE (dhcp-3.0.5rc1-ldap-patch) = 285970
+MD5 (dhcp-3.0.5rc1-dlq-patch) = 0e071945cc986d7ecdfd9b41fc4a102b
+SHA256 (dhcp-3.0.5rc1-dlq-patch) = c3fd3200eaf00fa80cb37f19bd3b9edb89497c235b5fa594a0f6f60050f64108
+SIZE (dhcp-3.0.5rc1-dlq-patch) = 7655
diff --git a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample b/net/isc-dhcp40-server/files/isc-dhcpd.in
index 97e56f5f9b24..382cf789402c 100644
--- a/net/isc-dhcp30-server/files/isc-dhcpd.sh.sample
+++ b/net/isc-dhcp40-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-dhcp40-server/files/isc-dhcrelay.sh.sample b/net/isc-dhcp40-server/files/isc-dhcrelay.in
index 11c9b00b3133..db10841ff32a 100644
--- a/net/isc-dhcp40-server/files/isc-dhcrelay.sh.sample
+++ b/net/isc-dhcp40-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-dhcp40-server/files/patch-server::dhcp.c b/net/isc-dhcp40-server/files/patch-server::dhcp.c
deleted file mode 100644
index 94981458272e..000000000000
--- a/net/isc-dhcp40-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,
diff --git a/net/isc-dhcp40-server/pkg-install b/net/isc-dhcp40-server/pkg-install
index 8bafd2bed768..e620536d1cbd 100644
--- a/net/isc-dhcp40-server/pkg-install
+++ b/net/isc-dhcp40-server/pkg-install
@@ -9,10 +9,18 @@
case $2 in
POST-INSTALL)
- ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
+ if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceinstall
+ else
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceinstall
+ fi
;;
DEINSTALL)
- ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
+ if [ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd ]; then
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd forceuninstall
+ else
+ ${PKG_PREFIX}/etc/rc.d/isc-dhcpd.sh forceuninstall
+ fi
;;
POST-DEINSTALL|PRE-INSTALL)
;;
diff --git a/net/isc-dhcp40-server/pkg-plist b/net/isc-dhcp40-server/pkg-plist
index 3daff57c0e42..e1028012ff4e 100644
--- a/net/isc-dhcp40-server/pkg-plist
+++ b/net/isc-dhcp40-server/pkg-plist
@@ -1,8 +1,9 @@
@comment $FreeBSD$
+@unexec %D/etc/rc.d/isc-dhcpd.sh forcestop 2>/dev/null || true
+@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
bin/omshell
%%LDAP%%bin/dhcpd-conf-to-ldap.pl
etc/dhcpd.conf.sample
-etc/rc.d/isc-dhcpd.sh
sbin/dhcpd
%%LDAP%%%%SCHEMA_DIR%%/dhcp.schema
%%LDAP%%@dirrm %%SCHEMA_DIR%%