From 80519e71fb02fdd659d59652a9bcc8178dc20453 Mon Sep 17 00:00:00 2001 From: obache Date: Fri, 15 Apr 2011 07:51:23 +0000 Subject: Use USE_FEATURES=inet6 instead of unusual usage of PKG_OPTIONS_REQUIRED_GROUPS. --- net/pim6dd/Makefile | 8 ++------ net/pim6sd/Makefile | 9 ++------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/net/pim6dd/Makefile b/net/pim6dd/Makefile index 00178a833bf..ccc29a1b328 100644 --- a/net/pim6dd/Makefile +++ b/net/pim6dd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2009/02/14 17:54:55 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2011/04/15 07:51:24 obache Exp $ DISTNAME= pim6dd-20031021a PKGREVISION= 1 @@ -11,17 +11,13 @@ COMMENT= IPv6 PIM dense mode daemon PKG_DESTDIR_SUPPORT= user-destdir USE_BSD_MAKEFILE= yes +USE_FEATURES+= inet6 CONFLICTS= mcast-tools-* WRKSRC= ${WRKDIR}/${DISTNAME}/pim6dd/ -PKG_OPTIONS_VAR= PKG_OPTIONS.pim6dd -PKG_OPTIONS_REQUIRED_GROUPS= inet6 # require inet6 capability -PKG_OPTIONS_GROUP.inet6= inet6 - INSTALLATION_DIRS= ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 \ ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin -.include "../../mk/bsd.options.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile index 0523e41aa41..ae72b6bd1ae 100644 --- a/net/pim6sd/Makefile +++ b/net/pim6sd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/02/14 17:57:18 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2011/04/15 07:51:23 obache Exp $ DISTNAME= pim6sd-20031021a PKGREVISION= 1 @@ -11,6 +11,7 @@ COMMENT= IPv6 PIM sparse mode daemon PKG_DESTDIR_SUPPORT= user-destdir USE_BSD_MAKEFILE= yes +USE_FEATURES+= inet6 WRKSRC= ${WRKDIR}/${DISTNAME}/pim6sd/ USE_TOOLS+= lex yacc @@ -22,10 +23,4 @@ CONFLICTS= mcast-tools-* post-install: ${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - -PKG_OPTIONS_VAR= PKG_OPTIONS.pim6sd -PKG_OPTIONS_REQUIRED_GROUPS= inet6 # require inet6 capability -PKG_OPTIONS_GROUP.inet6= inet6 - -.include "../../mk/bsd.options.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3