diff options
| author | Peter Pentchev <roam@FreeBSD.org> | 2001-04-22 11:59:08 +0000 |
|---|---|---|
| committer | Peter Pentchev <roam@FreeBSD.org> | 2001-04-22 11:59:08 +0000 |
| commit | 05a179bf6e3d54a017f8e98697393f049aeb1b65 (patch) | |
| tree | 4a872944a462c07fea011eef9e7cea4aacaece4f /net/isc-dhcp40-server | |
| parent | f2ccfe531ff6b3ebfacff46dc8488074fed0472a (diff) | |
| download | ports-05a179bf6e3d54a017f8e98697393f049aeb1b65.tar.gz ports-05a179bf6e3d54a017f8e98697393f049aeb1b65.zip | |
Update to 3.0RC2.
PR: 26753
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=41795
Diffstat (limited to 'net/isc-dhcp40-server')
| -rw-r--r-- | net/isc-dhcp40-server/Makefile | 24 | ||||
| -rw-r--r-- | net/isc-dhcp40-server/distinfo | 2 | ||||
| -rw-r--r-- | net/isc-dhcp40-server/files/patch-freebsd | 12 |
3 files changed, 29 insertions, 9 deletions
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile index c5ac6363c3f2..8e95e52e1f65 100644 --- a/net/isc-dhcp40-server/Makefile +++ b/net/isc-dhcp40-server/Makefile @@ -7,12 +7,12 @@ # PORTNAME= dhcp -PORTVERSION= 3.0.r1.1 +PORTVERSION= 3.0.r2 CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/ PKGNAMEPREFIX= isc- PKGNAMESUFFIX= 3 -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/:R}pl${PORTVERSION:E} +DISTNAME= ${PORTNAME}-${RELEASE}${VERSION}${PATCHLEVEL} MAINTAINER= clefevre@poboxes.com @@ -32,6 +32,26 @@ MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8 # Local variables # +# for instance, possible version formats are, in order: +# 1.2.r3.4 (or 1.2.b3.4), 1.2.r3 (or 1.2.b3), 1.2.3, 1.2 +# which have to become: +# 1.2rc3pl4 (or 1.2beta3pl4), 1.2rc3 (or 1.2beta3), 1.2pl3, 1.2 +VERSION= +PATCHLEVEL= +.if ${PORTVERSION:R:E:M[br]*} != "" +RELEASE= ${PORTVERSION:R:R} +VERSION= ${PORTVERSION:R:E:S/b/beta/:S/r/rc/} +PATCHLEVEL= pl${PORTVERSION:E} +.elif ${PORTVERSION:E:M[br]*} != "" +RELEASE= ${PORTVERSION:R} +VERSION= ${PORTVERSION:E:S/b/beta/:S/r/rc/} +.elif ${PORTVERSION:R:E} != "" +RELEASE= ${PORTVERSION:R} +PATCHLEVEL= pl${PORTVERSION:E} +.else +RELEASE= ${PORTVERSION} +.endif + PATCH_SUBDIRS= common minires dst omapip server client relay dhcpctl BIN_FILES= dhclient dhcpd dhcrelay diff --git a/net/isc-dhcp40-server/distinfo b/net/isc-dhcp40-server/distinfo index a72f6377fd0e..9e6a57d1190d 100644 --- a/net/isc-dhcp40-server/distinfo +++ b/net/isc-dhcp40-server/distinfo @@ -1 +1 @@ -MD5 (dhcp-3.0rc1pl1.tar.gz) = 93b7e388b9229605684235bb30080773 +MD5 (dhcp-3.0rc2.tar.gz) = 411e8e14291cd4158abcad5bf1bafa1d diff --git a/net/isc-dhcp40-server/files/patch-freebsd b/net/isc-dhcp40-server/files/patch-freebsd index 43c86a6aa95b..62fe0a127a40 100644 --- a/net/isc-dhcp40-server/files/patch-freebsd +++ b/net/isc-dhcp40-server/files/patch-freebsd @@ -1,12 +1,12 @@ ---- client/scripts/freebsd.orig Thu Mar 22 07:59:28 2001 -+++ client/scripts/freebsd Sat Mar 24 04:50:11 2001 +--- client/scripts/freebsd.orig Fri Apr 20 22:01:14 2001 ++++ client/scripts/freebsd Sat Apr 21 19:01:59 2001 @@ -16,17 +16,17 @@ # Must be used on exit. Invokes the local dhcp client exit hooks, if any. exit_with_hooks() { exit_status=$1 -- if [ -x /etc/dhclient-exit-hooks ]; then +- if [ -f /etc/dhclient-exit-hooks ]; then - . /etc/dhclient-exit-hooks -+ if [ -x !!PREFIX!!/etc/dhclient-exit-hooks ]; then ++ if [ -f !!PREFIX!!/etc/dhclient-exit-hooks ]; then + . !!PREFIX!!/etc/dhclient-exit-hooks fi # probably should do something with exit status of the local script @@ -14,8 +14,8 @@ } # Invoke the local dhcp client enter hooks, if they exist. --if [ -x /etc/dhclient-enter-hooks ]; then -+if [ -x !!PREFIX!!/etc/dhclient-enter-hooks ]; then +-if [ -f /etc/dhclient-enter-hooks ]; then ++if [ -f !!PREFIX!!/etc/dhclient-enter-hooks ]; then exit_status=0 - . /etc/dhclient-enter-hooks + . !!PREFIX!!/etc/dhclient-enter-hooks |