From 84db467ec7c8386066718011f8d47775d5608811 Mon Sep 17 00:00:00 2001
From: jlam <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.

---
 mail/clamav/PLIST      | 4 ++--
 mail/clamav/options.mk | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'mail/clamav')

diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST
index d01c1092e42..d68019264ff 100644
--- a/mail/clamav/PLIST
+++ b/mail/clamav/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/12/18 08:16:11 martti Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/04/12 22:43:03 jlam Exp $
 bin/clamav-config
 bin/clamconf
 bin/clamdscan
@@ -19,7 +19,7 @@ man/man5/clamd.conf.5
 man/man5/freshclam.conf.5
 man/man8/clamav-milter.8
 man/man8/clamd.8
-${MILTER}sbin/clamav-milter
+${PLIST.milter}sbin/clamav-milter
 sbin/clamd
 share/examples/clamav/clamd.conf
 share/examples/clamav/daily.cvd
diff --git a/mail/clamav/options.mk b/mail/clamav/options.mk
index c62df15397c..da405bb594c 100644
--- a/mail/clamav/options.mk
+++ b/mail/clamav/options.mk
@@ -1,10 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2007/07/11 17:44:22 xtraeme Exp $
+# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:03 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.clamav
 PKG_SUPPORTED_OPTIONS=	milter clamav-experimental
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		milter
+
 .if !empty(PKG_OPTIONS:Mmilter)
 # force use of pkgsrc version of libmilter -- clamav uses the sendmail binary
 # to check API compatibility(!), so it must build with as new a version of
@@ -12,12 +14,11 @@ PKG_SUPPORTED_OPTIONS=	milter clamav-experimental
 USE_BUILTIN.libmilter=	no
 .  include "../../mail/libmilter/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-milter
-PLIST_SUBST+=		MILTER=
+PLIST.milter=		yes
 .else
 CONFIGURE_ARGS+=	--disable-milter
 # XXX --disable-milter doesn't work as expected, so we need this
 CONFIGURE_ENV+=		ac_cv_header_libmilter_mfapi_h=no
-PLIST_SUBST+=		MILTER="@comment "
 .endif
 
 .if !empty(PKG_OPTIONS:Mclamav-experimental)
-- 
cgit v1.2.3