Date: Fri, 26 Oct 2012 04:50:01 GMT From: Craig Leres <leres@ee.lbl.gov> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/172586: [PATCH] dns/bind9[6789]: Add configure options and convert to OptionsNG Message-ID: <201210260450.q9Q4o1W2053032@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/172586; it has been noted by GNATS. From: Craig Leres <leres@ee.lbl.gov> To: bug-followup@FreeBSD.org Cc: leres@ee.lbl.gov, Erwin Lansing <erwin@FreeBSD.org> Subject: Re: ports/172586: [PATCH] dns/bind9[6789]: Add configure options and convert to OptionsNG Date: Thu, 25 Oct 2012 21:40:22 -0700 This is a multi-part message in MIME format. --------------020308070508070607070105 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit D'oh; let's try this one more time with unified diffs. Craig --------------020308070508070607070105 Content-Type: text/plain; charset=us-ascii; name="patch-bind96.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-bind96.txt" --- bind96/Makefile.orig 2012-10-25 19:08:24.000000000 -0700 +++ bind96/Makefile 2012-10-25 19:04:24.000000000 -0700 @@ -21,20 +21,25 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --with-randomdev=/dev/random -CONFLICTS= bind9*-9.[45789].* bind9-sdb-* host-* bind-tools-9.* +CONFLICTS= bind9*-9.[45789].* bind9*-sdb-9.[45789].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ + FIXED_RRSET \ SIGCHASE IPV6 THREADS DLZ OPTIONS_SINGLE= DLZ OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +SSL_DESC= Building without OpenSSL removes DNSSEC LINKS_DESC= Create conf file symlinks in ${PREFIX} XML_DESC= Support for xml statistics output REPLACE_BASE_DESC= Replace base BIND with this version LARGE_FILE_DESC= 64-bit file support SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +IPV6_DESC= IPv6 Support (autodetected by default) +THREADS_DESC= Compile with thread support +FIXED_RRSET_DESC= Enable fixed rrset ordering DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (single-threaded BIND) @@ -43,9 +48,6 @@ DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_STUB_DESC= DLZ stub driver -# Just in case -USE_OPENSSL= yes - .include <bsd.port.options.mk> .if (${ARCH} == "amd64") @@ -54,6 +56,7 @@ .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl @@ -91,6 +94,16 @@ CONFIGURE_ARGS+= --enable-ipv6 .endif +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+= --enable-threads +.else +CONFIGURE_ARGS+= --disable-threads +.endif + +.if ${PORT_OPTIONS:MFIXED_RRSET} +CONFIGURE_ARGS+= --enable-fixed-rrset +.endif + .if ${PORT_OPTIONS:MDLZ_POSTGRESQL} CONFIGURE_ARGS+= --with-dlz-postgres=yes USE_PGSQL= yes @@ -99,6 +112,10 @@ .if ${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --with-dlz-mysql=yes USE_MYSQL= yes +.if ${PORT_OPTIONS:MTHREADS} + @${ECHO_CMD} "Incompatible options: DLZ_MYSQL and THREADS" + @${FALSE} +.endif .endif .if ${PORT_OPTIONS:MDLZ_BDB} @@ -119,12 +136,6 @@ CONFIGURE_ARGS+= --with-dlz-stub=yes .endif -.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL) -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - .if ${PORT_OPTIONS:MREPLACE_BASE} PKGNAMESUFFIX= -base PREFIX= /usr --------------020308070508070607070105 Content-Type: text/plain; charset=us-ascii; name="patch-bind97.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-bind97.txt" --- bind97/Makefile.orig 2012-10-25 19:08:35.000000000 -0700 +++ bind97/Makefile 2012-10-25 18:53:44.000000000 -0700 @@ -23,10 +23,11 @@ --disable-symtable \ --with-randomdev=/dev/random -CONFLICTS= bind9*-9.[45689].* bind9-sdb-* host-* +CONFLICTS= bind9*-9.[45789].* bind9*-sdb-9.[45789].* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL IDN REPLACE_BASE LARGE_FILE SIGCHASE \ + FIXED_RRSET \ IPV6 THREADS .if !defined(BIND_TOOLS_SLAVE) OPTIONS_DEFINE+= LINKS XML DLZ @@ -34,11 +35,15 @@ OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +SSL_DESC= Building without OpenSSL removes DNSSEC LINKS_DESC= Create conf file symlinks in ${PREFIX} XML_DESC= Support for xml statistics output REPLACE_BASE_DESC= Replace base BIND with this version LARGE_FILE_DESC= 64-bit file support SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +IPV6_DESC= IPv6 Support (autodetected by default) +THREADS_DESC= Compile with thread support +FIXED_RRSET_DESC= Enable fixed rrset ordering DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (single-threaded BIND) @@ -50,9 +55,6 @@ CONFLICTS+= bind-tools-9.* .endif -# Just in case -USE_OPENSSL= yes - .include <bsd.port.options.mk> .if (${ARCH} == "amd64") @@ -61,6 +63,7 @@ .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl @@ -80,7 +83,7 @@ CONFIGURE_ARGS+= --without-idn .endif -.if ${PORT_OPTIONS:MLINKS} && empty($PORT_OPTIONS:M_REPLACE_BASE) +.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) PLIST_SUB+= LINKS="" .else PLIST_SUB+= LINKS="@comment " @@ -98,6 +101,16 @@ CONFIGURE_ARGS+= --enable-ipv6 .endif +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+= --enable-threads +.else +CONFIGURE_ARGS+= --disable-threads +.endif + +.if ${PORT_OPTIONS:MFIXED_RRSET} +CONFIGURE_ARGS+= --enable-fixed-rrset +.endif + .if ${PORT_OPTIONS:MDLZ_POSTGRESQL} CONFIGURE_ARGS+= --with-dlz-postgres=yes USE_PGSQL= yes @@ -106,6 +119,10 @@ .if ${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --with-dlz-mysql=yes USE_MYSQL= yes +.if ${PORT_OPTIONS:MTHREADS} + @${ECHO_CMD} "Incompatible options: DLZ_MYSQL and THREADS" + @${FALSE} +.endif .endif .if ${PORT_OPTIONS:MDLZ_BDB} @@ -126,12 +143,6 @@ CONFIGURE_ARGS+= --with-dlz-stub=yes .endif -.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL) -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - .if ${PORT_OPTIONS:MREPLACE_BASE} PKGNAMESUFFIX= -base PREFIX= /usr @@ -223,7 +234,7 @@ ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ* \ ${WRKSRC}/README ${DOCSDIR}/ .endif -.if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE) +.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif --------------020308070508070607070105 Content-Type: text/plain; charset=us-ascii; name="patch-bind98.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-bind98.txt" --- bind98/Makefile.orig 2012-10-25 19:08:41.000000000 -0700 +++ bind98/Makefile 2012-10-25 18:38:49.000000000 -0700 @@ -22,20 +22,26 @@ --disable-symtable \ --with-randomdev=/dev/random -CONFLICTS= bind9*-9.[45679].* bind9-sdb-* host-* bind-tools-9.* +CONFLICTS= bind9*-9.[45789].* bind9*-sdb-9.[45789].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ + FIXED_RRSET RPZ_NSIP RPZ_NSDNAME \ SIGCHASE IPV6 THREADS DLZ OPTIONS_SINGLE= DLZ OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +SSL_DESC= Building without OpenSSL removes DNSSEC LINKS_DESC= Create conf file symlinks in ${PREFIX} XML_DESC= Support for xml statistics output REPLACE_BASE_DESC= Replace base BIND with this version LARGE_FILE_DESC= 64-bit file support SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +IPV6_DESC= IPv6 Support (autodetected by default) +FIXED_RRSET_DESC= Enable fixed rrset ordering +RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules +RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (single-threaded BIND) @@ -50,11 +56,9 @@ ARCH= x86_64 .endif -# Just in case -USE_OPENSSL= yes - .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl @@ -74,7 +78,7 @@ CONFIGURE_ARGS+= --without-idn .endif -.if ${PORT_OPTIONS:MLINKS} && empty($PORT_OPTIONS:MBASE) +.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) PLIST_SUB+= LINKS="" .else PLIST_SUB+= LINKS="@comment " @@ -92,6 +96,24 @@ CONFIGURE_ARGS+= --enable-ipv6 .endif +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+= --enable-threads +.else +CONFIGURE_ARGS+= --disable-threads +.endif + +.if ${PORT_OPTIONS:MFIXED_RRSET} +CONFIGURE_ARGS+= --enable-fixed-rrset +.endif + +.if ${PORT_OPTIONS:MRPZ_NSIP} +CONFIGURE_ARGS+= --enable-rpz-nsip +.endif + +.if ${PORT_OPTIONS:MRPZ_NSDNAME} +CONFIGURE_ARGS+= --enable-rpz-nsdname +.endif + .if ${PORT_OPTIONS:MDLZ_POSTGRESQL} CONFIGURE_ARGS+= --with-dlz-postgres=yes USE_PGSQL= yes @@ -100,6 +122,10 @@ .if ${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --with-dlz-mysql=yes USE_MYSQL= yes +.if ${PORT_OPTIONS:MTHREADS} + @${ECHO_CMD} "Incompatible options: DLZ_MYSQL and THREADS" + @${FALSE} +.endif .endif .if ${PORT_OPTIONS:MDLZ_BDB} @@ -120,12 +146,6 @@ CONFIGURE_ARGS+= --with-dlz-stub=yes .endif -.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL) -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - .if ${PORT_OPTIONS:MREPLACE_BASE} PKGNAMESUFFIX= -base PREFIX= /usr @@ -216,7 +236,7 @@ ${CP} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${DOCSDIR}/ .endif -.if ${PORT_OPTIONS:MLINKS} && empty($PORTOPTIONS:MREPLACE_BASE) +.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .endif --------------020308070508070607070105 Content-Type: text/plain; charset=us-ascii; name="patch-bind99.txt" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="patch-bind99.txt" --- bind99/Makefile.orig 2012-10-25 19:08:45.000000000 -0700 +++ bind99/Makefile 2012-10-25 18:39:52.000000000 -0700 @@ -23,20 +23,26 @@ --with-randomdev=/dev/random \ --without-python -CONFLICTS= bind9*-9.[45678].* bind9-sdb-* host-* bind-tools-9.* +CONFLICTS= bind9*-9.[45789].* bind9*-sdb-9.[45789].* bind-tools-9.* OPTIONS_DEFAULT= IPV6 SSL LINKS XML THREADS OPTIONS_DEFINE= SSL LINKS XML IDN REPLACE_BASE LARGE_FILE \ + FIXED_RRSET RPZ_NSIP RPZ_NSDNAME \ SIGCHASE IPV6 THREADS DLZ OPTIONS_SINGLE= DLZ OPTIONS_SINGLE_DLZ= DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \ DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB +SSL_DESC= Building without OpenSSL removes DNSSEC LINKS_DESC= Create conf file symlinks in ${PREFIX} XML_DESC= Support for xml statistics output REPLACE_BASE_DESC= Replace base BIND with this version LARGE_FILE_DESC= 64-bit file support SIGCHASE_DESC= dig/host/nslookup will do DNSSEC validation +IPV6_DESC= IPv6 Support (autodetected by default) +FIXED_RRSET_DESC= Enable fixed rrset ordering +RPZ_NSIP_DESC= Enable RPZ NSIP trigger rules +RPZ_NSDNAME_DESC= Enable RPZ NSDNAME policy records DLZ_DESC= Dynamically Loadable Zones DLZ_POSTGRESQL_DESC= DLZ Postgres driver DLZ_MYSQL_DESC= DLZ MySQL driver (single-threaded BIND) @@ -45,9 +51,6 @@ DLZ_FILESYSTEM_DESC= DLZ filesystem driver DLZ_STUB_DESC= DLZ stub driver -# Just in case -USE_OPENSSL= yes - .include <bsd.port.options.mk> .if (${ARCH} == "amd64") @@ -56,6 +59,7 @@ .if ${PORT_OPTIONS:MSSL} CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} +USE_OPENSSL= yes .else CONFIGURE_ARGS+= --disable-openssl-version-check CONFIGURE_ARGS+= --without-openssl @@ -93,6 +97,24 @@ CONFIGURE_ARGS+= --enable-ipv6 .endif +.if ${PORT_OPTIONS:MTHREADS} +CONFIGURE_ARGS+= --enable-threads +.else +CONFIGURE_ARGS+= --disable-threads +.endif + +.if ${PORT_OPTIONS:MFIXED_RRSET} +CONFIGURE_ARGS+= --enable-fixed-rrset +.endif + +.if ${PORT_OPTIONS:MRPZ_NSIP} +CONFIGURE_ARGS+= --enable-rpz-nsip +.endif + +.if ${PORT_OPTIONS:MRPZ_NSDNAME} +CONFIGURE_ARGS+= --enable-rpz-nsdname +.endif + .if ${PORT_OPTIONS:MDLZ_POSTGRESQL} CONFIGURE_ARGS+= --with-dlz-postgres=yes USE_PGSQL= yes @@ -101,6 +123,10 @@ .if ${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --with-dlz-mysql=yes USE_MYSQL= yes +.if ${PORT_OPTIONS:MTHREADS} + @${ECHO_CMD} "Incompatible options: DLZ_MYSQL and THREADS" + @${FALSE} +.endif .endif .if ${PORT_OPTIONS:MDLZ_BDB} @@ -121,12 +147,6 @@ CONFIGURE_ARGS+= --with-dlz-stub=yes .endif -.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL) -CONFIGURE_ARGS+= --enable-threads -.else -CONFIGURE_ARGS+= --disable-threads -.endif - .if ${PORT_OPTIONS:MREPLACE_BASE} PKGNAMESUFFIX= -base PREFIX= /usr --------------020308070508070607070105--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210260450.q9Q4o1W2053032>