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/irrd | |
| 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/irrd')
| -rw-r--r-- | net/irrd/Makefile | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/net/irrd/Makefile b/net/irrd/Makefile index 83489cd305c..10c2e90a6c1 100644 --- a/net/irrd/Makefile +++ b/net/irrd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2007/03/24 19:21:29 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2007/09/07 22:12:18 jlam Exp $ DISTNAME= irrd2.2.8 PKGNAME= irrd-2.2.8 @@ -20,15 +20,23 @@ USE_TOOLS+= automake flex perl:run WRKSRC= ${WRKDIR}/${DISTNAME}/src -#PTHREAD_AUTO_VARS= yes -#PTHREAD_OPTS+= require +PKG_OPTIONS_VAR= PKG_OPTIONS.irrd +PKG_SUPPORTED_OPTIONS= inet6 + +.include "../../mk/bsd.options.mk" GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-thread -BUILD_DEFS+= USE_INET6 +#PTHREAD_AUTO_VARS= yes +#PTHREAD_OPTS+= require +#.include "../../mk/pthread.buildlink3.mk" -#CPPFLAGS+= -I${LOCALBASE}/include +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif REPLACE_PERL+= programs/irrdcacher/irrdcacher REPLACE_PERL+= programs/irrdcacher/ripe2rpsl @@ -44,14 +52,4 @@ post-install: ${INSTALL_SCRIPT} irrdcacher ${PREFIX}/sbin && \ ${INSTALL_SCRIPT} ripe2rpsl ${PREFIX}/sbin -.include "../../mk/bsd.prefs.mk" - -.if defined(USE_INET6) && ${USE_INET6} == "YES" -# default -# CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - -#.include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" |