| 1 |
diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/Makefile isc-dhcp41-server/Makefile |
| 2 |
--- /usr/ports/net/isc-dhcp41-server/Makefile 2012-04-18 10:55:18.000000000 -0700 |
| 3 |
+++ isc-dhcp41-server/Makefile 2012-06-16 14:18:14.000000000 -0700 |
| 4 |
@@ -21,22 +21,24 @@ |
| 5 |
|
| 6 |
LICENSE= ISCL |
| 7 |
|
| 8 |
-PATCHLEVEL= R4 |
| 9 |
-PORTREVISION_SERVER= 3 |
| 10 |
-PORTREVISION_CLIENT= 0 |
| 11 |
-PORTREVISION_RELAY= 3 |
| 12 |
+PATCHLEVEL= R5 |
| 13 |
+PORTREVISION_SERVER= 4 |
| 14 |
+PORTREVISION_CLIENT= 1 |
| 15 |
+PORTREVISION_RELAY= 4 |
| 16 |
|
| 17 |
SUBSYS?= server |
| 18 |
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-${PATCHLEVEL} |
| 19 |
|
| 20 |
UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} |
| 21 |
|
| 22 |
-OPTIONS= DHCP_IPV6 "Enable support for IPv6" on |
| 23 |
+OPTIONS_DEFINE= IPV6 |
| 24 |
+OPTIONS_DEFAULT=IPV6 |
| 25 |
|
| 26 |
.if ${SUBSYS} == server |
| 27 |
-OPTIONS+= DHCP_PARANOIA "Enable support for chroot" on \ |
| 28 |
- DHCP_LDAP "Experimental LDAP backend support" off \ |
| 29 |
- DHCP_LDAP_SSL "Support LDAP connection over SSL/TLS" on |
| 30 |
+OPTIONS_DEFINE+= PARANOIA LDAP LDAP_SSL |
| 31 |
+OPTIONS_DEFAULT+= PARANOIA LDAP_SSL |
| 32 |
+PARANOIA_DESC= Enable support for chroot |
| 33 |
+LDAP_SSL_DESC= Support LDAP over SSL/TLS |
| 34 |
.endif |
| 35 |
|
| 36 |
# PORTREVISION and CONFLICTS handling |
| 37 |
@@ -75,7 +77,7 @@ |
| 38 |
MAN3= dhcpctl.3 omapi.3 |
| 39 |
CFLAGS+= -fPIC |
| 40 |
CONF_FILE= dhcpd.conf |
| 41 |
-.if defined(WITH_DHCP_IPV6) |
| 42 |
+.if ${PORT_OPTIONS:MIPV6} |
| 43 |
CONF_FILE+= dhcpd6.conf |
| 44 |
.endif |
| 45 |
.else |
| 46 |
@@ -103,7 +105,7 @@ |
| 47 |
DOCSDIR="${DOCSDIR}" |
| 48 |
|
| 49 |
# XXX: Have to hardcode 4.1.1 here as there is no release for 4.1.2 or later. |
| 50 |
-.if defined(WITH_DHCP_LDAP) |
| 51 |
+.if ${PORT_OPTIONS:MLDAP} |
| 52 |
MASTER_SITES+= http://cloud.github.com/downloads/dcantrell/ldap-for-dhcp/:ldap |
| 53 |
LDAPPATCHRELEASE= 2 |
| 54 |
LDAPPATCHDIST= ldap-for-dhcp-4.1.1-${LDAPPATCHRELEASE} |
| 55 |
@@ -125,7 +127,7 @@ |
| 56 |
.endif |
| 57 |
|
| 58 |
# WITH_DHCP_LDAP_SSL without WITH_DHCP_LDAP is silly. |
| 59 |
-.if defined(WITH_DHCP_LDAP_SSL) && defined (WITH_DHCP_LDAP) |
| 60 |
+.if ${PORT_OPTIONS:MLDAP_SSL} && ${PORT_OPTIONS:MLDAP} |
| 61 |
USE_OPENSSL= yes |
| 62 |
CONFIGURE_ARGS+= --with-ldapcrypto |
| 63 |
CONFIGURE_ENV+= LIBS="-lssl" |
| 64 |
@@ -133,14 +135,14 @@ |
| 65 |
.include "${PORTSDIR}/Mk/bsd.openssl.mk" |
| 66 |
.endif |
| 67 |
|
| 68 |
-.if defined(WITH_DHCP_PARANOIA) |
| 69 |
+.if ${PORT_OPTIONS:MPARANOIA} |
| 70 |
CONFIGURE_ARGS+= --enable-paranoia --enable-early-chroot |
| 71 |
SUB_LIST+= PARANOIA=yes |
| 72 |
.else |
| 73 |
SUB_LIST+= PARANOIA=no |
| 74 |
.endif |
| 75 |
|
| 76 |
-.if defined(WITH_DHCP_IPV6) |
| 77 |
+.if ${PORT_OPTIONS:MIPV6} |
| 78 |
CONFIGURE_ARGS+= --enable-dhcpv6 |
| 79 |
PLIST_SUB+= IPV6="" |
| 80 |
.else |
| 81 |
@@ -149,7 +151,7 @@ |
| 82 |
.endif |
| 83 |
|
| 84 |
pre-patch: |
| 85 |
-.if ${SUBSYS} == server && defined(WITH_DHCP_LDAP) |
| 86 |
+.if ${SUBSYS} == server && ${PORT_OPTIONS:MLDAP} |
| 87 |
@${PATCH} ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE} ${FILESDIR}/extra-patch-${LDAPPATCHFILE} |
| 88 |
@cd ${WRKSRC} && ${PATCH} -p1 < ${WRKDIR}/${LDAPPATCHDIST}/${LDAPPATCHFILE} |
| 89 |
.endif |
| 90 |
@@ -169,17 +171,17 @@ |
| 91 |
${MAKE} -C ${WRKSRC}/includes install |
| 92 |
${MAKE} -C ${WRKSRC}/common install |
| 93 |
${INSTALL_DATA} ${WRKSRC}/dhcpctl/dhcpctl.h ${PREFIX}/include |
| 94 |
-.if defined(WITH_DHCP_IPV6) |
| 95 |
+.if ${PORT_OPTIONS:MIPV6} |
| 96 |
${INSTALL_DATA} ${WRKSRC}/doc/examples/dhcpd-dhcpv6.conf \ |
| 97 |
${PREFIX}/etc/dhcpd6.conf.sample |
| 98 |
.endif |
| 99 |
.endif |
| 100 |
-.if defined(WITH_DHCP_LDAP) |
| 101 |
+.if ${PORT_OPTIONS:MLDAP} |
| 102 |
@${MKDIR} ${SCHEMA_DIR} |
| 103 |
${INSTALL_DATA} ${LDAP_SCHEMA} ${SCHEMA_DIR} |
| 104 |
${INSTALL_SCRIPT} ${LDAP_SCRIPT} ${PREFIX}/bin |
| 105 |
.endif |
| 106 |
-.if defined(WITH_DHCP_LDAP) && !defined(NOPORTDOCS) |
| 107 |
+.if ${PORT_OPTIONS:MLDAP} && !defined(NOPORTDOCS) |
| 108 |
${MKDIR} ${DOCSDIR} |
| 109 |
${INSTALL_MAN} ${WRKDIR}/${LDAPPATCHDIST}/README.ldap ${DOCSDIR} |
| 110 |
${INSTALL_MAN} ${WRKDIR}/${LDAPPATCHDIST}/LICENSE.ldap ${DOCSDIR} |
| 111 |
@@ -196,17 +198,17 @@ |
| 112 |
.if ${SUBSYS} == client |
| 113 |
${INSTALL_SCRIPT} ${WRKSRC}/client/scripts/freebsd ${PREFIX}/sbin/dhclient-script |
| 114 |
.elif ${SUBSYS} == server |
| 115 |
-.if defined(WITH_DHCP_IPV6) |
| 116 |
+.if ${PORT_OPTIONS:MIPV6} |
| 117 |
@${LN} -sf isc-dhcpd ${PREFIX}/etc/rc.d/isc-dhcpd6 |
| 118 |
.endif |
| 119 |
.elif ${SUBSYS} == relay |
| 120 |
-.if defined(WITH_DHCP_IPV6) |
| 121 |
+.if ${PORT_OPTIONS:MIPV6} |
| 122 |
@${LN} -sf isc-dhcrelay ${PREFIX}/etc/rc.d/isc-dhcrelay6 |
| 123 |
.endif |
| 124 |
.endif |
| 125 |
@${SED} ${PKGMESSAGE_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ |
| 126 |
${MSG_FILE} > ${PKGMESSAGE} |
| 127 |
-.if defined(WITH_DHCP_LDAP) |
| 128 |
+.if ${PORT_OPTIONS:MLDAP} |
| 129 |
@${REINPLACE_CMD} -e 's|^%%LDAP%%||g' ${PKGMESSAGE} |
| 130 |
.else |
| 131 |
@${REINPLACE_CMD} -e '/^%%LDAP%%/d' ${PKGMESSAGE} |
| 132 |
diff -Nrux .svn -x work /usr/ports/net/isc-dhcp41-server/distinfo isc-dhcp41-server/distinfo |
| 133 |
--- /usr/ports/net/isc-dhcp41-server/distinfo 2011-12-07 15:45:50.000000000 -0800 |
| 134 |
+++ isc-dhcp41-server/distinfo 2012-06-16 13:54:16.662129131 -0700 |
| 135 |
@@ -1,4 +1,4 @@ |
| 136 |
-SHA256 (dhcp-4.1-ESV-R4.tar.gz) = 13b3c08695f0a663fe1e1b6af5ce8a4e052b3f4a291e404b463f5d2762e6000d |
| 137 |
-SIZE (dhcp-4.1-ESV-R4.tar.gz) = 1114257 |
| 138 |
+SHA256 (dhcp-4.1-ESV-R5.tar.gz) = c028fd6f9c1fff38fd0ae21cc89a70912e0eb759ea1019fb25b145cf14527583 |
| 139 |
+SIZE (dhcp-4.1-ESV-R5.tar.gz) = 1120684 |
| 140 |
SHA256 (ldap-for-dhcp-4.1.1-2.tar.gz) = 566b7be2ebefdc583d0bf0095c804ba69807b67e5cc29a2b64b1b39202b37d0d |
| 141 |
SIZE (ldap-for-dhcp-4.1.1-2.tar.gz) = 39004 |
