From 31597853cc377bc7f255d79b8cbdba990fd506a1 Mon Sep 17 00:00:00 2001 From: jlam Date: Sat, 12 Apr 2008 22:42:57 +0000 Subject: Convert to use PLIST_VARS instead of manually passing "@comment " through PLIST_SUBST to the plist module. --- net/bind9/Makefile | 7 +++---- net/bind9/PLIST | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'net/bind9') diff --git a/net/bind9/Makefile b/net/bind9/Makefile index 7837b0069cd..87bd9b2a6b6 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2008/01/18 05:08:40 tnn Exp $ +# $NetBSD: Makefile,v 1.96 2008/04/12 22:43:08 jlam Exp $ DISTNAME= bind-${BIND_VERSION} PKGNAME= ${DISTNAME:S/-P1/pl1/} @@ -45,10 +45,9 @@ FILES_SUBST+= BIND_GROUP=${BIND_GROUP:Q} BIND_USER=${BIND_USER:Q} PAX=${PAX:Q} MESSAGE_SUBST+= BIND_DIR=${BIND_DIR} BIND_USER=${BIND_USER} # include/isc/ipv6.h is installed on non-ipv6 platforms +PLIST_VARS+= inet6 .if !empty(MISSING_FEATURES:Minet6) -PLIST_SUBST+= IPV6H= -.else -PLIST_SUBST+= IPV6H="@comment " +PLIST.inet6= yes .endif PLIST_SRC= ${WRKDIR}/PLIST diff --git a/net/bind9/PLIST b/net/bind9/PLIST index 64ee08b01c2..4375b0a9ea6 100644 --- a/net/bind9/PLIST +++ b/net/bind9/PLIST @@ -1,10 +1,10 @@ -@comment $NetBSD: PLIST,v 1.20 2007/04/15 18:56:49 cjs Exp $ +@comment $NetBSD: PLIST,v 1.21 2008/04/12 22:43:08 jlam Exp $ bin/dig bin/host bin/isc-config.sh bin/nslookup bin/nsupdate -${IPV6H}include/isc/ipv6.h +${PLIST.inet6}include/isc/ipv6.h include/bind9/check.h include/bind9/getaddresses.h include/bind9/version.h -- cgit v1.2.3