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/inn | |
| 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/inn')
| -rw-r--r-- | news/inn/Makefile | 8 | ||||
| -rw-r--r-- | news/inn/options.mk | 15 |
2 files changed, 13 insertions, 10 deletions
diff --git a/news/inn/Makefile b/news/inn/Makefile index 6f457d95a22..ca329684ebc 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2007/07/04 20:54:54 jlam Exp $ +# $NetBSD: Makefile,v 1.85 2007/09/07 22:12:20 jlam Exp $ DISTNAME= inn-2.4.3 PKGREVISION= 1 @@ -14,7 +14,7 @@ COMMENT= The public release of InterNet News (INN) CONFLICTS+= libradius-[0-9]* nntpclnt-[0-9]* .include "Makefile.common" -BUILD_DEFS+= USE_INET6 + BUILD_DEFS+= INN_DATA_DIR FILES_SUBST+= INN_DATA_DIR=${INN_DATA_DIR:Q} @@ -82,10 +82,6 @@ RCD_SCRIPTS= innd .include "../../mk/bsd.prefs.mk" -.if defined(USE_INET6) && ${USE_INET6} == YES -CONFIGURE_ARGS+= --enable-ipv6 -.endif - .if ${OPSYS} == "SunOS" CONFIGURE_ARGS+= --with-sendmail=/usr/lib/sendmail .else diff --git a/news/inn/options.mk b/news/inn/options.mk index 9f00299ce9d..490cfc89150 100644 --- a/news/inn/options.mk +++ b/news/inn/options.mk @@ -1,12 +1,19 @@ -# $NetBSD: options.mk,v 1.2 2007/02/22 19:27:01 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2007/09/07 22:12:20 jlam Exp $ -PKG_OPTIONS_VAR= PKG_OPTIONS.inn -PKG_SUPPORTED_OPTIONS= python -PKG_SUGGESTED_OPTIONS= +PKG_OPTIONS_VAR= PKG_OPTIONS.inn +PKG_SUPPORTED_OPTIONS= inet6 python +PKG_SUGGESTED_OPTIONS= # empty .include "../../mk/bsd.options.mk" ### +### IPv6 support +### +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.endif + +### ### Python support for INN ### .if !empty(PKG_OPTIONS:Mpython) |