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. --- sysutils/socket/Makefile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'sysutils/socket') diff --git a/sysutils/socket/Makefile b/sysutils/socket/Makefile index cb9a8d0d063..c4259ddac90 100644 --- a/sysutils/socket/Makefile +++ b/sysutils/socket/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/02/22 19:27:12 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2007/09/07 22:12:23 jlam Exp $ DISTNAME= socket-1.1 CATEGORIES= sysutils net @@ -9,13 +9,15 @@ COMMENT= Create tcp socket and connect to stdin/out MAKE_ENV+= INSTALLBASE=${PREFIX:Q} -BUILD_DEFS+= USE_INET6 +PKG_OPTIONS_VAR= PKG_OPTIONS.socket +PKG_SUPPORTED_OPTIONS= inet6 -# to get USE_INET6 -.include "../../mk/bsd.prefs.mk" +.include "../../mk/bsd.options.mk" -# IPv6 support -.if defined(USE_INET6) && ${USE_INET6} == YES +### +### IPv6 support +### +.if !empty(PKG_OPTIONS:Minet6) MAKE_ENV+= SWITCHES="-DUSE_INET6 -DHAVE_SYS_PARAM_H -Wall" .else MAKE_ENV+= SWITCHES="-DHAVE_SYS_PARAM_H -Wall" -- cgit v1.2.3