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. --- mbone/sdr/Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'mbone/sdr') diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile index 98b5f5ece2e..010358d241e 100644 --- a/mbone/sdr/Makefile +++ b/mbone/sdr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2006/04/11 18:43:29 minskim Exp $ +# $NetBSD: Makefile,v 1.48 2007/09/07 22:12:14 jlam Exp $ # DISTNAME= sdr-3.0 @@ -13,13 +13,15 @@ COMMENT= MBone Session Directory WRKSRC= ${WRKDIR}/sdr/${SYSDIR} CRYPTO= yes USE_TOOLS+= gmake +HAS_CONFIGURE= yes -BUILD_DEFS+= USE_INET6 +PKG_OPTIONS_VAR= PKG_OPTIONS.sdr +PKG_SUPPORTED_OPTIONS= inet6 -.include "../../mk/bsd.prefs.mk" +.include "../../mk/bsd.options.mk" -.if defined(USE_INET6) && ${USE_INET6} == "YES" -CONFIGURE_ARGS+= --enable-ipv6 +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 .endif .if exists(/usr/include/sys/inttypes.h) @@ -40,11 +42,12 @@ post-patch: ${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/../src/sdr.tcl.in > \ ${WRKSRC}/../src/sdr.tcl -do-configure: - cd ${WRKSRC} ; ${SH} ./configure .if ${OPSYS} == "SunOS" +post-configure: # Untested for sdr 3.0 !!! - ${CAT} ${WRKSRC}/sdr/solaris/Makefile.solaris ${WRKSRC}/sdr/src/Makefile.template > ${WRKSRC}/sdr/solaris/Makefile + ${CAT} ${WRKSRC}/sdr/solaris/Makefile.solaris \ + ${WRKSRC}/sdr/src/Makefile.template \ + > ${WRKSRC}/sdr/solaris/Makefile .endif do-install: -- cgit v1.2.3