From owner-freebsd-ports Mon Jan 22 12:20:31 2001 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 4CB2137B6A9 for ; Mon, 22 Jan 2001 12:20:09 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.1/8.11.1) id f0MKK9j86518; Mon, 22 Jan 2001 12:20:09 -0800 (PST) (envelope-from gnats) Received: from camus.cybercable.fr (camus.cybercable.fr [212.198.0.200]) by hub.freebsd.org (Postfix) with SMTP id 8040437B6A8 for ; Mon, 22 Jan 2001 12:14:25 -0800 (PST) Received: (qmail 38886045 invoked from network); 22 Jan 2001 20:14:12 -0000 Received: from s011.dhcp212-229.cybercable.fr (HELO gits.dyndns.org) ([212.198.229.11]) (envelope-sender ) by camus.cybercable.fr (qmail-ldap-1.03) with SMTP for ; 22 Jan 2001 20:14:12 -0000 Received: (from root@localhost) by gits.dyndns.org (8.11.1/8.11.1) id f0MKEAZ99075; Mon, 22 Jan 2001 21:14:10 +0100 (CET) (envelope-from root) Message-Id: <200101222014.f0MKEAZ99075@gits.dyndns.org> Date: Mon, 22 Jan 2001 21:14:10 +0100 (CET) From: Cyrille Lefevre Reply-To: clefevre@citeweb.net To: FreeBSD-gnats-submit@freebsd.org Cc: obrien@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/24542: Updated port: net/isc-dhcp3 (beta 2 patch level 14) Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 24542 >Category: ports >Synopsis: Updated port: net/isc-dhcp3 (beta 2 patch level 14) >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Jan 22 12:20:01 PST 2001 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.2-STABLE i386 >Organization: ACME >Environment: FreeBSD gits 4.2-STABLE FreeBSD 4.2-STABLE #5: Thu Jan 18 00:14:29 CET 2001 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: update ISC dhcp to the latest version, which is 3.0b2pl14. Makefile version bumbed. DISTNAME heuristic changed. maintainer updated. long lines wrapped. makefiles patch loop changed from files to dirs. distinfo updated. pkg-plist updated. files/patch-freebsd user.notice -> !!USE_FACILITY!!.notice >How-To-Repeat: n/a >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/Makefile,v retrieving revision 1.48 diff -u -r1.48 Makefile --- Makefile 2000/12/23 18:55:08 1.48 +++ Makefile 2001/01/22 20:12:56 @@ -7,19 +7,16 @@ # PORTNAME= isc-dhcp3 -PORTVERSION= 3.0.b2.11 +PORTVERSION= 3.0.b2.14 CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/dhcp/ -DISTNAME= dhcp-3.0b2pl${PORTVERSION:S/3.0.b2.//g} +DISTNAME= ${PORTNAME:S/isc-//:S/3/-/}${PORTVERSION:S/.b/b/:R}pl${PORTVERSION:E} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= clefevre@citeweb.net -.if defined(USE_FACILITY) -_USE_FACILITY:= `${ECHO} ${USE_FACILITY} | ${TR} "[:lower:]" "[:upper:]"` -USE_FACILITY= ${_USE_FACILITY} -.else -USE_FACILITY= DAEMON -.endif +# +# Global variables +# HAS_CONFIGURE= yes @@ -29,8 +26,23 @@ dhcpd.leases.5 MAN8= dhclient.8 dhclient-script.8 dhcpd.8 dhcrelay.8 +# +# Local variables +# + +.if !defined(USE_FACILITY) +USE_FACILITY= DAEMON +.endif + +USE_FACILITY_U= ${USE_FACILITY:U} +USE_FACILITY_L= ${USE_FACILITY:L} + +# +# Pre-fetch +# + pre-fetch: -.if ${USE_FACILITY} == "DAEMON" +.if ${USE_FACILITY_U} == "DAEMON" @${ECHO} "" @${ECHO} " You can choose which syslog faciliy by setting LOG_FACILITY to:" @${ECHO} " daemon, local{0-7}" @@ -41,22 +53,49 @@ @sleep 2 .endif -post-patch: - @${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/includes/dhcpd.h - @${PERL} -pi.fbsd -e "s.!!USE_FACILITY!!.${USE_FACILITY}.g" ${WRKSRC}/includes/site.h - @${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' ${WRKSRC}/client/scripts/freebsd -.for MF in relay/Makefile.dist server/Makefile.dist client/Makefile.dist common/Makefile.dist dhcpctl/Makefile.dist minires/Makefile.dist omapip/Makefile.dist - @${PERL} -pi.fbsd -e 's|^DEBUG[ ]*=|DEBUG ?=|g ; s|^CFLAGS[ ]*=|CFLAGS +=|g' ${WRKSRC}/${MF} +# +# Post-patch +# + +post-patch: patch-includes patch-scripts patch-makefiles + +patch-includes: + @${PERL} -pi.fbsd -e 's.!!PREFIX!!.${PREFIX}.g' \ + ${WRKSRC}/includes/dhcpd.h + @${PERL} -pi.fbsd -e 's.!!USE_FACILITY!!.${USE_FACILITY_U}.g' \ + ${WRKSRC}/includes/site.h + +patch-scripts: + @${PERL} -pi.fbsd -e \ + 's.!!PREFIX!!.${PREFIX}.g;s.!!USE_FACILITY!!.${USE_FACILITY_L}.g' \ + ${WRKSRC}/client/scripts/freebsd + +patch-makefiles: +.for subdir in relay server client common dhcpctl minires omapip + @${PERL} -pi.fbsd -e \ + 's|^DEBUG[ ]*=|DEBUG ?=|g;s|^CFLAGS[ ]*=|CFLAGS +=|g' \ + ${WRKSRC}/${subdir}/Makefile.dist .endfor + +# +# Post-install +# -post-install: - ${TOUCH} /var/db/dhcpd.leases +post-install: strip-commands install-startup-file create-conf-files + +strip-commands: .for file in dhclient dhcpd dhcrelay - if [ -f ${PREFIX}/sbin/${file} ]; then \ + @if [ -f ${PREFIX}/sbin/${file} ]; then \ strip ${PREFIX}/sbin/${file}; \ fi .endfor - ${INSTALL_SCRIPT} ${FILESDIR}/isc-dhcpd.sh.sample \ - ${PREFIX}/etc/rc.d + +install-startup-file: + @${INSTALL_SCRIPT} ${FILESDIR}/isc-dhcpd.sh.sample ${PREFIX}/etc/rc.d + +create-conf-files: + @[ -f /var/db/dhclient.leases ] || ${TOUCH} /var/db/dhclient.leases + @[ -f /var/db/dhcpd.leases ] || ${TOUCH} /var/db/dhcpd.leases + @[ -f ${PREFIX}/dhclient.conf ] || ${TOUCH} ${PREFIX}/dhclient.conf .include Index: distinfo =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/distinfo,v retrieving revision 1.20 diff -u -r1.20 distinfo --- distinfo 2000/12/02 06:25:48 1.20 +++ distinfo 2001/01/21 08:37:40 @@ -1 +1 @@ -MD5 (dhcp-3.0b2pl11.tar.gz) = 5fd2c97d850c41e6445648a4108b509f +MD5 (dhcp-3.0b2pl14.tar.gz) = 4286aea902a53be24f1a7e6e1b68a5ad Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/pkg-plist,v retrieving revision 1.14 diff -u -r1.14 pkg-plist --- pkg-plist 2000/12/23 18:53:58 1.14 +++ pkg-plist 2001/01/22 20:00:31 @@ -19,5 +19,9 @@ include/dhcpctl.h lib/libomapi.a lib/libdhcpctl.a -@exec touch /var/db/dhcpd.leases -@exec touch %D/etc/dhclient.conf +@exec [ -f /var/db/dhclient.leases ] || touch /var/db/dhclient.leases +@unexec [ -s /var/db/dhclient.leases ] || rm -f /var/db/dhclient.leases +@exec [ -f /var/db/dhcpd.leases ] || touch /var/db/dhcpd.leases +@unexec [ -s /var/db/dhcpd.leases ] || rm -f /var/db/dhcpd.leases +@exec [ -f %D/etc/dhclient.conf ] || touch %D/etc/dhclient.conf +@unexec [ -L %D/etc/dhclient.conf -o -s %D/etc/dhclient.conf ] || rm -f %D/etc/dhclient.conf Index: files/patch-freebsd =================================================================== RCS file: /home/ncvs/ports/net/isc-dhcp3/files/patch-freebsd,v retrieving revision 1.2 diff -u -r1.2 patch-freebsd --- files/patch-freebsd 2000/09/27 10:36:13 1.2 +++ files/patch-freebsd 2001/01/22 19:05:11 @@ -4,7 +4,7 @@ #!/bin/sh +if [ -x /usr/bin/logger ]; then -+ LOGGER="/usr/bin/logger -s -p user.notice -t dhclient" ++ LOGGER="/usr/bin/logger -s -p !!USE_FACILITY!!.notice -t dhclient" +else + LOGGER=echo +fi >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message