diff options
| author | jlam <jlam> | 2007-09-07 22:12:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2007-09-07 22:12:10 +0000 |
| commit | 2f517bc25c1dfd477877da169af65a161a689211 (patch) | |
| tree | e65f4ff0343b21db10e01b4ee2a8fa56a72846a8 /net/bind9 | |
| parent | 3045177d1ce3c7d590e5aaa6d5777696d6f55aa6 (diff) | |
| download | pkgsrc-2f517bc25c1dfd477877da169af65a161a689211.tar.gz | |
Convert packages that test and use USE_INET6 to use the options framework
and to support the "inet6" option instead.
Remaining usage of USE_INET6 was solely for the benefit of the scripts
that generate the README.html files. Replace:
BUILD_DEFS+= USE_INET6
with
BUILD_DEFS+= IPV6_READY
and teach the README-generation tools to look for that instead.
This nukes USE_INET6 from pkgsrc proper. We leave a tiny bit of code
to continue to support USE_INET6 for pkgsrc-wip until it has been nuked
from there as well.
Diffstat (limited to 'net/bind9')
| -rw-r--r-- | net/bind9/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/bind9/Makefile b/net/bind9/Makefile index 0f7d36d2560..f032cece1aa 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2007/08/08 18:32:46 reed Exp $ +# $NetBSD: Makefile,v 1.94 2007/09/07 22:12:16 jlam Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P1/pl1/} @@ -14,12 +14,11 @@ BIND_VERSION= 9.4.1-P1 # IPv6 ready, automatically detected .include "../../mk/bsd.prefs.mk" -BUILD_DEFS+= USE_INET6 -# No need to set USE_INET6, will auto-detect. +BUILD_DEFS+= IPV6_READY BUILD_DEFS+= BIND_DIR VARBASE -USE_LIBTOOL= yes +USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libtool=yes \ @@ -46,10 +45,10 @@ FILES_SUBST+= BIND_GROUP=${BIND_GROUP:Q} BIND_USER=${BIND_USER:Q} PAX=${PAX:Q} MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER} # include/isc/ipv6.h is installed on non-ipv6 platforms -.if defined(USE_INET6) && (${USE_INET6} == "YES") -PLIST_SUBST+= IPV6H="@comment " -.else +.if !empty(MISSING_FEATURES:Minet6) PLIST_SUBST+= IPV6H= +.else +PLIST_SUBST+= IPV6H="@comment " .endif PLIST_SRC= ${WRKDIR}/PLIST |