net/isc-dhcp41-server/isc-dhcp41-server.2011-05-08T000347Z.diff

diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/Makefile isc-dhcp41-server/Makefile
--- /usr/ports/net/isc-dhcp41-server/Makefile   2011-04-10 14:40:52.000000000 -0700
+++ isc-dhcp41-server/Makefile  2011-05-07 17:02:56.874671113 -0700
@@ -31,8 +31,10 @@
 
 UNIQUENAME=    ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
+OPTIONS=       DHCP_IPV6 "Enable support for IPv6" on
+
 .if ${SUBSYS} == server
-OPTIONS=       DHCP_PARANOIA "Enable support for chroot" on \
+OPTIONS+=      DHCP_PARANOIA "Enable support for chroot" on \
                DHCP_LDAP "Experimental LDAP backend support" off \
                DHCP_LDAP_SSL "Support LDAP connection over SSL/TLS" on
 .endif
@@ -72,7 +74,10 @@
 MAN1=          omshell.1
 MAN3=          dhcpctl.3 omapi.3
 CFLAGS+=       -fPIC
-CONF_FILE=     dhcpd.conf dhcpd6.conf
+CONF_FILE=     dhcpd.conf
+.if defined(WITH_DHCP_IPV6)
+CONF_FILE+=    dhcpd6.conf
+.endif
 .else
 MAN8+=         dhcrelay.8
 .endif
@@ -135,6 +140,14 @@
 SUB_LIST+=     PARANOIA=no
 .endif
 
+.if defined(WITH_DHCP_IPV6)
+CONFIGURE_ARGS+=       --enable-dhcpv6
+PLIST_SUB+=            IPV6=""
+.else
+CONFIGURE_ARGS+=       --disable-dhcpv6
+PLIST_SUB+=            IPV6="@comment "
+.endif
+
 pre-patch:
 .if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
        @cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE}
@@ -155,9 +168,11 @@
        ${MAKE} -C ${WRKSRC}/includes install
        ${MAKE} -C ${WRKSRC}/common install
        ${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${PREFIX}/include
+.if defined(WITH_DHCP_IPV6)
        ${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \
                ${PREFIX}/etc/dhcpd6.conf.sample
 .endif
+.endif
 .if defined(WITH_DHCP_LDAP)
        @${MKDIR} ${SCHEMA_DIR}
        ${INSTALL_DATA} ${LDAP_SCHEMA} ${SCHEMA_DIR}
@@ -180,8 +195,10 @@
 .if ${SUBSYS} == client
        ${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${PREFIX}/sbin/dhclient-script
 .elif ${SUBSYS} == server
+.if defined(WITH_DHCP_IPV6)
        @${LN} -sf isc-dhcpd ${PREFIX}/etc/rc.d/isc-dhcpd6
 .endif
+.endif
        @${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
                ${MSG_FILE} > ${PKGMESSAGE}
 .if defined(WITH_DHCP_LDAP)
diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/pkg-plist isc-dhcp41-server/pkg-plist
--- /usr/ports/net/isc-dhcp41-server/pkg-plist  2011-02-13 18:21:27.000000000 -0800
+++ isc-dhcp41-server/pkg-plist 2011-05-07 16:31:34.089931339 -0700
@@ -1,13 +1,13 @@
 @comment $FreeBSD: ports/net/isc-dhcp41-server/pkg-plist,v 1.4 2011/02/14 02:21:27 wxs Exp $
 @unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null || true
-@unexec %D/etc/rc.d/isc-dhcpd6 forcestop 2>/dev/null || true
+%%IPV6%%@unexec %D/etc/rc.d/isc-dhcpd6 forcestop 2>/dev/null || true
 @unexec if cmp -s %D/etc/dhcpd.conf.sample %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi
 etc/dhcpd.conf.sample
 @exec if [ ! -f %D/etc/dhcpd.conf ] ; then cp -p %D/%F %B/dhcpd.conf; fi
-@unexec if cmp -s %D/etc/dhcpd6.conf.sample %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi
-etc/dhcpd6.conf.sample
-@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi
-etc/rc.d/isc-dhcpd6
+%%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%%@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi
+%%IPV6%%etc/rc.d/isc-dhcpd6
 sbin/dhcpd
 bin/omshell
 %%LDAP%%bin/dhcpd-conf-to-ldap
Revision:	497
Committed:	2012-02-19T17:36:49-08:00 (13 years, 4 months ago) by douglas
File size:	3290 byte(s)
Log Message:	Use ISO 8601 basic format instead of extended format since Windows is unhappy when I try to select a file with ':'s to attach in Thunderbird.
#	User	Rev	Content
1	douglas	389	diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/Makefile isc-dhcp41-server/Makefile
2	douglas	440	--- /usr/ports/net/isc-dhcp41-server/Makefile 2011-04-10 14:40:52.000000000 -0700
3			+++ isc-dhcp41-server/Makefile 2011-05-07 17:02:56.874671113 -0700
4			@@ -31,8 +31,10 @@
5	douglas	389
6	douglas	440	UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
7	douglas	389
8	douglas	440	+OPTIONS= DHCP_IPV6 "Enable support for IPv6" on
9	douglas	389	+
10	douglas	440	.if ${SUBSYS} == server
11			-OPTIONS= DHCP_PARANOIA "Enable support for chroot" on \
12			+OPTIONS+= DHCP_PARANOIA "Enable support for chroot" on \
13			DHCP_LDAP "Experimental LDAP backend support" off \
14			DHCP_LDAP_SSL "Support LDAP connection over SSL/TLS" on
15			.endif
16			@@ -72,7 +74,10 @@
17			MAN1= omshell.1
18			MAN3= dhcpctl.3 omapi.3
19			CFLAGS+= -fPIC
20			-CONF_FILE= dhcpd.conf dhcpd6.conf
21			+CONF_FILE= dhcpd.conf
22			+.if defined(WITH_DHCP_IPV6)
23			+CONF_FILE+= dhcpd6.conf
24			+.endif
25			.else
26			MAN8+= dhcrelay.8
27			.endif
28			@@ -135,6 +140,14 @@
29			SUB_LIST+= PARANOIA=no
30			.endif
31	douglas	389
32	douglas	440	+.if defined(WITH_DHCP_IPV6)
33			+CONFIGURE_ARGS+= --enable-dhcpv6
34			+PLIST_SUB+= IPV6=""
35			+.else
36			+CONFIGURE_ARGS+= --disable-dhcpv6
37			+PLIST_SUB+= IPV6="@comment "
38			+.endif
39			+
40			pre-patch:
41			.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP)
42			@cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE}
43			@@ -155,9 +168,11 @@
44			${MAKE} -C ${WRKSRC}/includes install
45			${MAKE} -C ${WRKSRC}/common install
46			${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${PREFIX}/include
47			+.if defined(WITH_DHCP_IPV6)
48			${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \
49			${PREFIX}/etc/dhcpd6.conf.sample
50			.endif
51			+.endif
52			.if defined(WITH_DHCP_LDAP)
53			@${MKDIR} ${SCHEMA_DIR}
54			${INSTALL_DATA} ${LDAP_SCHEMA} ${SCHEMA_DIR}
55			@@ -180,8 +195,10 @@
56			.if ${SUBSYS} == client
57			${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${PREFIX}/sbin/dhclient-script
58			.elif ${SUBSYS} == server
59			+.if defined(WITH_DHCP_IPV6)
60			@${LN} -sf isc-dhcpd ${PREFIX}/etc/rc.d/isc-dhcpd6
61			.endif
62			+.endif
63			@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
64			${MSG_FILE} > ${PKGMESSAGE}
65			.if defined(WITH_DHCP_LDAP)
66			diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/pkg-plist isc-dhcp41-server/pkg-plist
67			--- /usr/ports/net/isc-dhcp41-server/pkg-plist 2011-02-13 18:21:27.000000000 -0800
68			+++ isc-dhcp41-server/pkg-plist 2011-05-07 16:31:34.089931339 -0700
69			@@ -1,13 +1,13 @@
70			@comment $FreeBSD: ports/net/isc-dhcp41-server/pkg-plist,v 1.4 2011/02/14 02:21:27 wxs Exp $
71			@unexec %D/etc/rc.d/isc-dhcpd forcestop 2>/dev/null \|\| true
72			-@unexec %D/etc/rc.d/isc-dhcpd6 forcestop 2>/dev/null \|\| true
73			+%%IPV6%%@unexec %D/etc/rc.d/isc-dhcpd6 forcestop 2>/dev/null \|\| true
74			@unexec if cmp -s %D/etc/dhcpd.conf.sample %D/etc/dhcpd.conf; then rm -f %D/etc/dhcpd.conf; fi
75			etc/dhcpd.conf.sample
76			@exec if [ ! -f %D/etc/dhcpd.conf ] ; then cp -p %D/%F %B/dhcpd.conf; fi
77			-@unexec if cmp -s %D/etc/dhcpd6.conf.sample %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi
78			-etc/dhcpd6.conf.sample
79			-@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi
80			-etc/rc.d/isc-dhcpd6
81			+%%IPV6%%@unexec if cmp -s %D/etc/dhcpd6.conf.sample %D/etc/dhcpd6.conf; then rm -f %D/etc/dhcpd6.conf; fi
82			+%%IPV6%%etc/dhcpd6.conf.sample
83			+%%IPV6%%@exec if [ ! -f %D/etc/dhcpd6.conf ] ; then cp -p %D/%F %B/dhcpd6.conf; fi
84			+%%IPV6%%etc/rc.d/isc-dhcpd6
85			sbin/dhcpd
86			bin/omshell
87			%%LDAP%%bin/dhcpd-conf-to-ldap