From 07dd3147c68f13b523ce8edfd486a3f4f0d47fe1 Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 7 Sep 2007 22:12:10 +0000 Subject: 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. --- news/knews/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'news/knews/Makefile') diff --git a/news/knews/Makefile b/news/knews/Makefile index 2808908e099..f1ddfec6ee9 100644 --- a/news/knews/Makefile +++ b/news/knews/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2007/02/15 14:44:49 joerg Exp $ +# $NetBSD: Makefile,v 1.50 2007/09/07 22:12:21 jlam Exp $ DISTNAME= knews-1.0b.1 PKGNAME= knews-1.0 @@ -14,10 +14,15 @@ CONFLICTS= knews-1.0b0 USE_IMAKE= YES -BUILD_DEFS+= KNEWS_DOMAIN_NAME KNEWS_DOMAIN_FILE USE_INET6 +BUILD_DEFS+= KNEWS_DOMAIN_NAME KNEWS_DOMAIN_FILE .include "../../mk/bsd.prefs.mk" +PKG_OPTIONS_VAR= PKG_OPTIONS.knews +PKG_SUPPORTED_OPTIONS= inet6 + +.include "../../mk/bsd.options.mk" + # Set KNEWS_DOMAIN_NAME to a string appended to the "From:" header or # KNEWS_DOMAIN_FILE to a file from which the domain name will be read. post-extract: @@ -37,7 +42,7 @@ post-patch: ${ECHO} >>${WRKSRC}/configure.h \ "#define DOMAIN_NAME \"${KNEWS_DOMAIN_NAME}\"" .endif -.if defined(USE_INET6) && ${USE_INET6} == YES +.if !empty(PKG_OPTIONS:Minet6) ${ECHO} >>${WRKSRC}/configure.h "#define USE_INET6 YES" .endif -- cgit v1.2.3