diff options
author | Doug Barton <dougb@FreeBSD.org> | 2006-08-28 06:03:13 +0000 |
---|---|---|
committer | Doug Barton <dougb@FreeBSD.org> | 2006-08-28 06:03:13 +0000 |
commit | f7b8b9e6a376ecf0c349bb960d3f63338d475bda (patch) | |
tree | 5dd8b87e81158687554508e441199cdb7d62eddc /dns | |
parent | - Update to 4.0.3 (diff) |
Add OPTIONS to the rest of my ports that need them.
Add CONFLICTS to the bind* ports.
Notes
Notes:
svn path=/head/; revision=171498
Diffstat (limited to 'dns')
-rw-r--r-- | dns/bind8/Makefile | 17 | ||||
-rw-r--r-- | dns/bind84/Makefile | 17 | ||||
-rw-r--r-- | dns/bind9/Makefile | 26 | ||||
-rw-r--r-- | dns/bind94/Makefile | 26 | ||||
-rw-r--r-- | dns/bind95/Makefile | 26 | ||||
-rw-r--r-- | dns/bind96/Makefile | 26 |
6 files changed, 64 insertions, 74 deletions
diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile index 72497326f109..bf2ac2cbbca3 100644 --- a/dns/bind8/Makefile +++ b/dns/bind8/Makefile @@ -24,8 +24,15 @@ EXTRACT_ONLY= bind-src.tar.gz bind-doc.tar.gz MAINTAINER?= DougB@FreeBSD.org COMMENT= The Berkeley Internet Name Domain, an implementation of DNS -.if defined(PORT_REPLACES_BASE_BIND8_INCLUDES) -PORT_REPLACES_BASE_BIND8= yes +CONFLICTS= bind84-8.* bind9* host-* zh-bind-8.* + +OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \ + REPLACE_BASE_INCLUDES "Replace includes as well as binaries" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_REPLACE_BASE_INCLUDES) +WITH_REPLACE_BASE= yes INCLUDE_PATH= include PLIST_SUB+= INCLUDE_PATH=${INCLUDE_PATH} .else @@ -33,7 +40,7 @@ INCLUDE_PATH= include/bind PLIST_SUB+= INCLUDE_PATH=${INCLUDE_PATH} .endif -.if defined(PORT_REPLACES_BASE_BIND8) +.if defined(WITH_REPLACE_BASE) PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb @@ -80,7 +87,7 @@ post-patch: @${MV} ${WRKSRC}/port/freebsd/Makefile.set.sed \ ${WRKSRC}/port/freebsd/Makefile.set -.if defined(PORT_REPLACES_BASE_BIND8) +.if defined(WITH_REPLACE_BASE) .for dir in nslookup nsupdate @${SED} -e "s#{DESTBIN}#{DESTSBIN}#g" \ ${WRKSRC}/bin/${dir}/Makefile > ${WRKSRC}/bin/${dir}/Makefile.sed @@ -113,4 +120,4 @@ post-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/dns/bind84/Makefile b/dns/bind84/Makefile index 5cb8f13be8e6..70441c86ee42 100644 --- a/dns/bind84/Makefile +++ b/dns/bind84/Makefile @@ -24,8 +24,15 @@ EXTRACT_ONLY= bind-src.tar.gz bind-doc.tar.gz MAINTAINER= DougB@FreeBSD.org COMMENT= The Berkeley Internet Name Domain, an implementation of DNS -.if defined(PORT_REPLACES_BASE_BIND8_INCLUDES) -PORT_REPLACES_BASE_BIND8= yes +CONFLICTS= bind-8.* bind9* host-* zh-bind-8.* + +OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \ + REPLACE_BASE_INCLUDES "Replace includes as well as binaries" off + +.include <bsd.port.pre.mk> + +.if defined(WITH_REPLACE_BASE_INCLUDES) +WITH_REPLACE_BASE= yes INCLUDE_PATH= include PLIST_SUB+= INCLUDE_PATH=${INCLUDE_PATH} .else @@ -33,7 +40,7 @@ INCLUDE_PATH= include/bind PLIST_SUB+= INCLUDE_PATH=${INCLUDE_PATH} .endif -.if defined(PORT_REPLACES_BASE_BIND8) +.if defined(WITH_REPLACE_BASE) PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb @@ -86,7 +93,7 @@ post-patch: @${MV} ${WRKSRC}/lib/irs/getaddrinfo.c.sed \ ${WRKSRC}/lib/irs/getaddrinfo.c -.if defined(PORT_REPLACES_BASE_BIND8) +.if defined(WITH_REPLACE_BASE) .for dir in nslookup nsupdate @${SED} -e "s#{DESTBIN}#{DESTSBIN}#g" \ ${WRKSRC}/bin/${dir}/Makefile > ${WRKSRC}/bin/${dir}/Makefile.sed @@ -119,4 +126,4 @@ post-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile index 275860df39eb..c4e19d815cf2 100644 --- a/dns/bind9/Makefile +++ b/dns/bind9/Makefile @@ -33,6 +33,13 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ USE_OPENSSL= yes +CONFLICTS= bind-8.* bind84-8.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.* + +OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \ + THREADS "Compile with thread support (NOT RECOMMENDED!)" off + +.include <bsd.port.pre.mk> + .if defined(WITH_OPENSSL_PORT) CONFIGURE_ARGS+= --with-openssl=${LOCALBASE} .else @@ -41,13 +48,13 @@ CONFIGURE_ARGS+= --with-openssl # ISC staff has informed me that for 9.3.x, threads are always a bad idea. # Leave the affirmative option for those that want to experiment. -.if defined(WITH_BIND9_THREADS) +.if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if defined(WITH_PORT_REPLACES_BASE_BIND9) +.if defined(WITH_REPLACE_BASE) PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb @@ -98,19 +105,6 @@ MAN5= named.conf.5 rndc.conf.5 MAN8= dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \ named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8 -pre-fetch: -.if defined(PORT_REPLACES_BASE_BIND9) - @${ECHO} "" - @${ECHO} "***************************************************" - @${ECHO} "Support for the old PORT_REPLACES_BASE_BIND9 option" - @${ECHO} "will be removed in future versions of the port." - @${ECHO} "Use WITH_PORT_REPLACES_BASE_BIND9 instead." - @${ECHO} "***************************************************" - @${ECHO} "" - @/bin/sleep 5 -WITH_PORT_REPLACES_BASE_BIND9= true -.endif - verify: checksum gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc @@ -136,4 +130,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile index 275860df39eb..c4e19d815cf2 100644 --- a/dns/bind94/Makefile +++ b/dns/bind94/Makefile @@ -33,6 +33,13 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ USE_OPENSSL= yes +CONFLICTS= bind-8.* bind84-8.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.* + +OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \ + THREADS "Compile with thread support (NOT RECOMMENDED!)" off + +.include <bsd.port.pre.mk> + .if defined(WITH_OPENSSL_PORT) CONFIGURE_ARGS+= --with-openssl=${LOCALBASE} .else @@ -41,13 +48,13 @@ CONFIGURE_ARGS+= --with-openssl # ISC staff has informed me that for 9.3.x, threads are always a bad idea. # Leave the affirmative option for those that want to experiment. -.if defined(WITH_BIND9_THREADS) +.if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if defined(WITH_PORT_REPLACES_BASE_BIND9) +.if defined(WITH_REPLACE_BASE) PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb @@ -98,19 +105,6 @@ MAN5= named.conf.5 rndc.conf.5 MAN8= dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \ named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8 -pre-fetch: -.if defined(PORT_REPLACES_BASE_BIND9) - @${ECHO} "" - @${ECHO} "***************************************************" - @${ECHO} "Support for the old PORT_REPLACES_BASE_BIND9 option" - @${ECHO} "will be removed in future versions of the port." - @${ECHO} "Use WITH_PORT_REPLACES_BASE_BIND9 instead." - @${ECHO} "***************************************************" - @${ECHO} "" - @/bin/sleep 5 -WITH_PORT_REPLACES_BASE_BIND9= true -.endif - verify: checksum gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc @@ -136,4 +130,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/dns/bind95/Makefile b/dns/bind95/Makefile index 275860df39eb..c4e19d815cf2 100644 --- a/dns/bind95/Makefile +++ b/dns/bind95/Makefile @@ -33,6 +33,13 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ USE_OPENSSL= yes +CONFLICTS= bind-8.* bind84-8.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.* + +OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \ + THREADS "Compile with thread support (NOT RECOMMENDED!)" off + +.include <bsd.port.pre.mk> + .if defined(WITH_OPENSSL_PORT) CONFIGURE_ARGS+= --with-openssl=${LOCALBASE} .else @@ -41,13 +48,13 @@ CONFIGURE_ARGS+= --with-openssl # ISC staff has informed me that for 9.3.x, threads are always a bad idea. # Leave the affirmative option for those that want to experiment. -.if defined(WITH_BIND9_THREADS) +.if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if defined(WITH_PORT_REPLACES_BASE_BIND9) +.if defined(WITH_REPLACE_BASE) PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb @@ -98,19 +105,6 @@ MAN5= named.conf.5 rndc.conf.5 MAN8= dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \ named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8 -pre-fetch: -.if defined(PORT_REPLACES_BASE_BIND9) - @${ECHO} "" - @${ECHO} "***************************************************" - @${ECHO} "Support for the old PORT_REPLACES_BASE_BIND9 option" - @${ECHO} "will be removed in future versions of the port." - @${ECHO} "Use WITH_PORT_REPLACES_BASE_BIND9 instead." - @${ECHO} "***************************************************" - @${ECHO} "" - @/bin/sleep 5 -WITH_PORT_REPLACES_BASE_BIND9= true -.endif - verify: checksum gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc @@ -136,4 +130,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/dns/bind96/Makefile b/dns/bind96/Makefile index 275860df39eb..c4e19d815cf2 100644 --- a/dns/bind96/Makefile +++ b/dns/bind96/Makefile @@ -33,6 +33,13 @@ CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ USE_OPENSSL= yes +CONFLICTS= bind-8.* bind84-8.* bind9-dlz-* bind9-sdb-mysql-* host-* zh-bind-8.* + +OPTIONS= REPLACE_BASE "Replace base BIND with this version" off \ + THREADS "Compile with thread support (NOT RECOMMENDED!)" off + +.include <bsd.port.pre.mk> + .if defined(WITH_OPENSSL_PORT) CONFIGURE_ARGS+= --with-openssl=${LOCALBASE} .else @@ -41,13 +48,13 @@ CONFIGURE_ARGS+= --with-openssl # ISC staff has informed me that for 9.3.x, threads are always a bad idea. # Leave the affirmative option for those that want to experiment. -.if defined(WITH_BIND9_THREADS) +.if defined(WITH_THREADS) CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads .endif -.if defined(WITH_PORT_REPLACES_BASE_BIND9) +.if defined(WITH_REPLACE_BASE) PKGNAMESUFFIX= -base PREFIX= /usr BIND_DESTETC= /etc/namedb @@ -98,19 +105,6 @@ MAN5= named.conf.5 rndc.conf.5 MAN8= dnssec-keygen.8 dnssec-signzone.8 lwresd.8 named-checkconf.8 \ named-checkzone.8 named.8 nsupdate.8 rndc-confgen.8 rndc.8 -pre-fetch: -.if defined(PORT_REPLACES_BASE_BIND9) - @${ECHO} "" - @${ECHO} "***************************************************" - @${ECHO} "Support for the old PORT_REPLACES_BASE_BIND9 option" - @${ECHO} "will be removed in future versions of the port." - @${ECHO} "Use WITH_PORT_REPLACES_BASE_BIND9 instead." - @${ECHO} "***************************************************" - @${ECHO} "" - @/bin/sleep 5 -WITH_PORT_REPLACES_BASE_BIND9= true -.endif - verify: checksum gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc @@ -136,4 +130,4 @@ post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.post.mk> |