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 /news/leafnode | |
| 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 'news/leafnode')
| -rw-r--r-- | news/leafnode/Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 6299703ca26..39f7fb9b031 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2007/09/06 21:51:53 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2007/09/07 22:12:21 jlam Exp $ DISTNAME= leafnode-1.11.3.rel PKGNAME= ${DISTNAME:S/.rel//} @@ -32,7 +32,6 @@ PKG_SHELL.${LEAFNODE_USER}= ${SH} PKG_GROUPS_VARS+= LEAFNODE_GROUP PKG_USERS_VARS+= LEAFNODE_USER -BUILD_DEFS+= USE_INET6 FILES_SUBST+= LEAFNODE_SPOOL=${LEAFNODE_SPOOL:Q} FILES_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR:Q} @@ -48,9 +47,12 @@ CONFIGURE_ARGS+= --with-user=${LEAFNODE_USER:Q} CONFIGURE_ARGS+= --with-group=${LEAFNODE_GROUP:Q} USE_TOOLS+= gmake -.include "../../mk/bsd.prefs.mk" +PKG_OPTIONS_VAR= PKG_OPTIONS.leafnode +PKG_SUPPORTED_OPTIONS= inet6 -.if defined(USE_INET6) && ${USE_INET6} == YES +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Minet6) CONFIGURE_ARGS+= --with-ipv6 .else CONFIGURE_ARGS+= --without-ipv6 |