--- bind99/Makefile 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 .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