Date: Thu, 18 Apr 2013 01:25:42 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316014 - in head/net: isc-dhcp42-client isc-dhcp42-relay isc-dhcp42-server isc-dhcp42-server/files Message-ID: <201304180125.r3I1PgKl038093@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Thu Apr 18 01:25:41 2013 New Revision: 316014 URL: http://svnweb.freebsd.org/changeset/ports/316014 Log: - Update to 4.2.5P1 - Switch to new 'created by' header Feature safe: yes Added: head/net/isc-dhcp42-server/files/patch-client__dhclient.conf.example (contents, props changed) Deleted: head/net/isc-dhcp42-server/files/patch-client__Makefile.in head/net/isc-dhcp42-server/files/patch-client__dhclient.conf head/net/isc-dhcp42-server/files/patch-server__Makefile.am head/net/isc-dhcp42-server/files/patch-server__Makefile.in Modified: head/net/isc-dhcp42-client/Makefile head/net/isc-dhcp42-client/pkg-plist head/net/isc-dhcp42-relay/Makefile head/net/isc-dhcp42-server/Makefile head/net/isc-dhcp42-server/distinfo head/net/isc-dhcp42-server/pkg-plist Modified: head/net/isc-dhcp42-client/Makefile ============================================================================== --- head/net/isc-dhcp42-client/Makefile Wed Apr 17 23:52:53 2013 (r316013) +++ head/net/isc-dhcp42-client/Makefile Thu Apr 18 01:25:41 2013 (r316014) @@ -1,9 +1,5 @@ -# Ports collection makefile for: isc-dhcp42-client -# Date created: 29 June 2011 -# Whom: Ryan Steinmetz <rpsfa@rit.edu> -# +# Created by: Ryan Steinmetz <rpsfa@rit.edu> # $FreeBSD$ -# COMMENT= The ISC Dynamic Host Configuration Protocol client Modified: head/net/isc-dhcp42-client/pkg-plist ============================================================================== --- head/net/isc-dhcp42-client/pkg-plist Wed Apr 17 23:52:53 2013 (r316013) +++ head/net/isc-dhcp42-client/pkg-plist Thu Apr 18 01:25:41 2013 (r316014) @@ -1,8 +1,8 @@ @comment $FreeBSD$ sbin/dhclient sbin/dhclient-script -@unexec if cmp -s %D/etc/dhclient.conf.sample %D/etc/dhclient.conf; then rm -f %D/etc/dhclient.conf; fi -etc/dhclient.conf.sample +@unexec if cmp -s %D/etc/dhclient.conf.example %D/etc/dhclient.conf; then rm -f %D/etc/dhclient.conf; fi +etc/dhclient.conf.example @exec if [ ! -f %D/etc/dhclient.conf ] ; then cp -p %D/%F %B/dhclient.conf; fi @exec [ -f /var/run/dhclient.leases ] || touch /var/run/dhclient.leases @unexec [ -s /var/run/dhclient.leases ] || rm -f /var/run/dhclient.leases Modified: head/net/isc-dhcp42-relay/Makefile ============================================================================== --- head/net/isc-dhcp42-relay/Makefile Wed Apr 17 23:52:53 2013 (r316013) +++ head/net/isc-dhcp42-relay/Makefile Thu Apr 18 01:25:41 2013 (r316014) @@ -1,9 +1,5 @@ -# Ports collection makefile for: isc-dhcp42-relay -# Date created: 29 June 2011 -# Whom: Ryan Steinmetz <rpsfa@rit.edu> -# +# Created by: Ryan Steinmetz <rpsfa@rit.edu> # $FreeBSD$ -# COMMENT= The ISC Dynamic Host Configuration Protocol relay Modified: head/net/isc-dhcp42-server/Makefile ============================================================================== --- head/net/isc-dhcp42-server/Makefile Wed Apr 17 23:52:53 2013 (r316013) +++ head/net/isc-dhcp42-server/Makefile Thu Apr 18 01:25:41 2013 (r316014) @@ -1,12 +1,8 @@ -# Ports collection makefile for: isc-dhcp42-server -# Date created: 29 June 2011 -# Whom: Ryan Steinmetz <rpsfa@rit.edu> -# +# Created by: Ryan Steinmetz <rpsfa@rit.edu> # $FreeBSD$ -# PORTNAME= dhcp -DISTVERSION= 4.2.4 +DISTVERSION= 4.2.5 PORTREVISION= ${DHCP_PORTREVISION} CATEGORIES= net MASTER_SITES= ${MASTER_SITE_ISC} @@ -22,8 +18,8 @@ LICENSE= ISCL USE_GMAKE= yes -PATCHLEVEL= P2 -PORTREVISION_SERVER= 2 +PATCHLEVEL= P1 +PORTREVISION_SERVER= 0 PORTREVISION_CLIENT= 0 PORTREVISION_RELAY= 0 @@ -70,7 +66,7 @@ SCRIPTS_ENV+= PKG_PREFIX=${PREFIX} .if ${SUBSYS} == client MAN5+= dhclient.conf.5 dhclient.leases.5 MAN8+= dhclient.8 dhclient-script.8 -CONF_FILE= dhclient.conf +CONF_FILE= dhclient.conf.example .elif ${SUBSYS} == server CONFIGURE_ARGS+=--localstatedir=/var MAN5+= dhcpd.conf.5 dhcpd.leases.5 dhcp-eval.5 dhcp-options.5 @@ -152,7 +148,7 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/local||g' \ ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf @${REINPLACE_CMD} ${REINPLACE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${WRKSRC}/client/dhclient.conf + ${WRKSRC}/client/dhclient.conf.example do-install: ${MAKE} -C ${WRKSRC}/${SUBSYS} install @@ -165,14 +161,14 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${PREFIX}/include .if ${PORT_OPTIONS:MIPV6} ${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \ - ${PREFIX}/etc/dhcpd6.conf.sample + ${PREFIX}/etc/dhcpd6.conf.example .endif .if ${PORT_OPTIONS:MLDAP} @${MKDIR} ${SCHEMA_DIR} ${INSTALL_DATA} ${LDAP_SCHEMA} ${SCHEMA_DIR} ${INSTALL_SCRIPT} ${LDAP_SCRIPT} ${PREFIX}/bin .endif -.if ${PORT_OPTIONS:MLDAP} && !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MLDAP} && empty(PORT_OPTIONS:MDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_MAN} ${WRKSRC}/contrib/ldap/README.ldap ${DOCSDIR} .endif @@ -182,7 +178,7 @@ post-install: .if defined(CONF_FILE) .for FILE in ${CONF_FILE} if [ ! -f ${PREFIX}/etc/${FILE} ]; then \ - ${CP} -p ${PREFIX}/etc/${FILE}.sample ${PREFIX}/etc/${FILE} ; \ + ${CP} -p ${PREFIX}/etc/${FILE}.example ${PREFIX}/etc/${FILE} ; \ fi .endfor .endif Modified: head/net/isc-dhcp42-server/distinfo ============================================================================== --- head/net/isc-dhcp42-server/distinfo Wed Apr 17 23:52:53 2013 (r316013) +++ head/net/isc-dhcp42-server/distinfo Thu Apr 18 01:25:41 2013 (r316014) @@ -1,2 +1,2 @@ -SHA256 (dhcp-4.2.4-P2.tar.gz) = 0f75170e323cd9573e6e09a5d9236725f3e56e3cac5a70a01fe2a9d76b436499 -SIZE (dhcp-4.2.4-P2.tar.gz) = 8190209 +SHA256 (dhcp-4.2.5-P1.tar.gz) = 59b06c9f5d775e46999b422c45b9229402c462b114ce1685617bfb2b8b028250 +SIZE (dhcp-4.2.5-P1.tar.gz) = 8255960 Added: head/net/isc-dhcp42-server/files/patch-client__dhclient.conf.example ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/isc-dhcp42-server/files/patch-client__dhclient.conf.example Thu Apr 18 01:25:41 2013 (r316014) @@ -0,0 +1,11 @@ +--- ./client/dhclient.conf.example.orig 2013-01-25 20:26:40.000000000 -0500 ++++ ./client/dhclient.conf.example 2013-01-25 20:26:53.000000000 -0500 +@@ -11,7 +11,7 @@ + reboot 10; + select-timeout 5; + initial-interval 2; +-script "/etc/dhclient-script"; ++script "%%PREFIX%%/sbin/dhclient-script"; + media "-link0 -link1 -link2", "link0 link1"; + reject 192.33.137.209; + Modified: head/net/isc-dhcp42-server/pkg-plist ============================================================================== --- head/net/isc-dhcp42-server/pkg-plist Wed Apr 17 23:52:53 2013 (r316013) +++ head/net/isc-dhcp42-server/pkg-plist Thu Apr 18 01:25:41 2013 (r316014) @@ -1,10 +1,10 @@ @comment $FreeBSD$ -@unexec if cmp -s %D/etc/dhcpd.conf.sample %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi +@unexec if cmp -s %D/etc/dhcpd.conf.example %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi @unexec echo "You should stop the dhcpd and dhcpd6 daemons if you are permanently removing this port." -etc/dhcpd.conf.sample +etc/dhcpd.conf.example @exec if [ ! -f %D/etc/dhcpd.conf ] ; then cp -p %D/%F %B/dhcpd.conf; fi -%%IPV6%%@unexec if cmp -s %D/etc/dhcpd6.conf.sample %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi -%%IPV6%%etc/dhcpd6.conf.sample +%%IPV6%%@unexec if cmp -s %D/etc/dhcpd6.conf.example %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi +%%IPV6%%etc/dhcpd6.conf.example %%IPV6%%@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi %%IPV6%%etc/rc.d/isc-dhcpd6 sbin/dhcpd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304180125.r3I1PgKl038093>