Date: Sat, 21 Apr 2001 19:28:34 +0200 (CEST) From: Cyrille Lefevre <clefevre@poboxes.com> To: FreeBSD-gnats-submit@freebsd.org Cc: sumikawa@freebsd.org Subject: ports/26753: Updated port: net/isc-dhcp3 (release candidate 2) Message-ID: <200104211728.f3LHSYr18841@gits.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 26753 >Category: ports >Synopsis: Updated port: net/isc-dhcp3 (release candidate 2) >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 21 10:30:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.3-BETA i386 >Organization: ACME >Environment: FreeBSD gits 4.3-BETA FreeBSD 4.3-BETA #18: Sat Mar 17 02:17:40 CET 2001 root@:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: well! the chase to the dhcp versions race began... from this point, you'll have to commit changes faster than they goes obsolete... ready, go ;^) Makefile PORTVERSION bumped to 3.0.r2 DISTNAME heuristic changed. distname updated files/patch-freebsd updated >How-To-Repeat: n/a >Fix: cd /usr/ports/net/isc-dhcp3; patch -p1 < this_file diff -ruN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ isc-dhcp3.old/Makefile isc-dhcp3/Makefile --- isc-dhcp3.old/Makefile Sat Apr 21 19:09:23 2001 +++ isc-dhcp3/Makefile Sat Apr 21 19:12:06 2001 @@ -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 @@ -31,6 +31,26 @@ # # 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 diff -ruN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ isc-dhcp3.old/distinfo isc-dhcp3/distinfo --- isc-dhcp3.old/distinfo Sat Apr 21 19:09:23 2001 +++ isc-dhcp3/distinfo Sat Apr 21 19:12:06 2001 @@ -1 +1 @@ -MD5 (dhcp-3.0rc1pl1.tar.gz) = 93b7e388b9229605684235bb30080773 +MD5 (dhcp-3.0rc2.tar.gz) = 411e8e14291cd4158abcad5bf1bafa1d diff -ruN -x CVS -x work -x *~ -x *.orig -x *.rej -I $Id.*$ -I $FreeBSD.*$ isc-dhcp3.old/files/patch-freebsd isc-dhcp3/files/patch-freebsd --- isc-dhcp3.old/files/patch-freebsd Sat Mar 24 12:09:53 2001 +++ isc-dhcp3/files/patch-freebsd Sat Apr 21 19:12:06 2001 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200104211728.f3LHSYr18841>