Convert to use PLIST_VARS instead of manually passing "@comment "

through PLIST_SUBST to the plist module.

3 files changed, 32 insertions, 44 deletions

diff --git a/net/samba/Makefile b/net/samba/Makefile
index a6ca90af5ec..76dbdeab250 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.180 2008/04/03 20:19:42 jlam Exp $
+# $NetBSD: Makefile,v 1.181 2008/04/12 22:43:08 jlam Exp $
 
 .include "Makefile.mirrors"
 
@@ -70,11 +70,10 @@ CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 # Only Linux supports mount.cifs for mounting a CIFS share into the
 # filesystem.
 #
+PLIST_VARS+=		cifsmount
 .if ${OPSYS} == "Linux"
 CONFIGURE_ARGS+=	--with-cifsmount
-PLIST_SUBST+=		CIFSMOUNT=
-.else
-PLIST_SUBST+=		CIFSMOUNT="@comment "
+PLIST.cifsmount=	yes
 .endif
 
 # mktemp is useful for the replacement adduser script, but don't require
diff --git a/net/samba/PLIST b/net/samba/PLIST
index 7a2bc0422fd..6e2ce5987fe 100644
--- a/net/samba/PLIST
+++ b/net/samba/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2008/04/03 20:19:42 jlam Exp $
+@comment $NetBSD: PLIST,v 1.39 2008/04/12 22:43:08 jlam Exp $
 bin/eventlogadm
 bin/findsmb
 bin/net
@@ -21,11 +21,11 @@ bin/tdbbackup
 bin/tdbdump
 bin/tdbtool
 bin/testparm
-${WINBIND}bin/wbinfo
+${PLIST.winbind}bin/wbinfo
 include/libmsrpc.h
 include/libsmbclient.h
-${NSS_WINBIND}
-${NSS_WINS}
+${PLIST.winbind}${NSS_WINBIND}
+${PLIST.winbind}${NSS_WINS}
 lib/samba/auth/script.so
 lib/samba/charset/CP437.so
 lib/samba/charset/CP850.so
@@ -61,14 +61,14 @@ lib/samba/vfs/extd_audit.so
 lib/samba/vfs/fake_perms.so
 lib/samba/vfs/full_audit.so
 lib/samba/vfs/netatalk.so
-${FAM}lib/samba/vfs/notify_fam.so
+${PLIST.fam}lib/samba/vfs/notify_fam.so
 lib/samba/vfs/readahead.so
 lib/samba/vfs/readonly.so
 lib/samba/vfs/recycle.so
 lib/samba/vfs/shadow_copy.so
-${PAM_SMBPASS}
-${PAM_WINBIND}
-${CUPS}libexec/cups/backend/smb
+${PLIST.pam}lib/security/pam_smbpass.so
+${PLIST.pam}${PLIST.winbind}lib/security/pam_winbind.so
+${PLIST.cups}libexec/cups/backend/smb
 man/man1/findsmb.1
 man/man1/log2pcap.1
 man/man1/nmblookup.1
@@ -129,15 +129,15 @@ man/man8/vfs_readonly.8
 man/man8/vfs_recycle.8
 man/man8/vfs_shadow_copy.8
 man/man8/winbindd.8
-${CIFSMOUNT}sbin/mount.cifs
+${PLIST.cifsmount}sbin/mount.cifs
 sbin/nmbd
 sbin/smbd
 sbin/swat
-${CIFSMOUNT}sbin/umount.cifs
-${WINBIND}sbin/winbindd
+${PLIST.cifsmount}sbin/umount.cifs
+${PLIST.winbind}sbin/winbindd
 share/doc/samba/NT4-Locking.reg
 share/doc/samba/NT4_PlainPassword.reg
-${PAM}share/doc/samba/README.pam_smbpass
+${PLIST.pam}share/doc/samba/README.pam_smbpass
 share/doc/samba/Win-2Kx-XPP-DeleteCachedProfiles.reg
 share/doc/samba/Win-2Kx-XPP-ForceLocalProfile.reg
 share/doc/samba/Win-NT-DeleteRoamingProfile.reg
@@ -151,16 +151,16 @@ share/doc/samba/WindowsTerminalServer.reg
 share/examples/rc.d/nmbd
 share/examples/rc.d/samba
 share/examples/rc.d/smbd
-${WINBIND}share/examples/rc.d/winbindd
+${PLIST.winbind}share/examples/rc.d/winbindd
 share/examples/samba/adduser.sh
 share/examples/samba/deluser.sh
 share/examples/samba/mknissmbpasswd.sh
 share/examples/samba/mknissmbpwdtbl.sh
 share/examples/samba/mksmbpasswd.sh
-${PAM}share/examples/samba/pam_smbpass/kdc-pdc
-${PAM}share/examples/samba/pam_smbpass/password-mature
-${PAM}share/examples/samba/pam_smbpass/password-migration
-${PAM}share/examples/samba/pam_smbpass/password-sync
+${PLIST.pam}share/examples/samba/pam_smbpass/kdc-pdc
+${PLIST.pam}share/examples/samba/pam_smbpass/password-mature
+${PLIST.pam}share/examples/samba/pam_smbpass/password-migration
+${PLIST.pam}share/examples/samba/pam_smbpass/password-sync
 share/examples/samba/samba.schema
 share/examples/samba/smb.conf.default
 share/examples/samba/updatesmbpasswd.sh
@@ -639,7 +639,7 @@ share/samba/swat/using_samba/toc.html
 @dirrm share/samba/swat/help
 @dirrm share/samba/swat
 @dirrm share/samba
-${PAM}@dirrm share/examples/samba/pam_smbpass
+${PLIST.pam}@dirrm share/examples/samba/pam_smbpass
 @dirrm share/examples/samba
 @dirrm share/doc/samba
 @dirrm lib/samba/vfs
diff --git a/net/samba/options.mk b/net/samba/options.mk
index 0adc5c05810..b96f6361b88 100644
--- a/net/samba/options.mk
+++ b/net/samba/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2008/04/03 20:19:42 jlam Exp $
+# $NetBSD: options.mk,v 1.24 2008/04/12 22:43:08 jlam Exp $
 
 # Recommended package options for various setups:
 #
@@ -51,10 +51,11 @@ CONFIGURE_ARGS+=	--with-acl-support
 ###
 ### Native CUPS support for providing printing services.
 ###
+PLIST_VARS+=		cups
 .if !empty(PKG_OPTIONS:Mcups)
 .  include "../../print/cups/buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-cups
-PLIST_SUBST+=		CUPS=
+PLIST.cups=		yes
 INSTALLATION_DIRS+=	libexec/cups/backend
 
 .PHONY: samba-cups-install
@@ -64,19 +65,18 @@ samba-cups-install:
 		${LN} -fs ../../../bin/smbspool smb
 .else
 CONFIGURE_ARGS+=	--disable-cups
-PLIST_SUBST+=		CUPS="@comment "
 .endif
 
 ###
 ### Access Control List support.
 ###
+PLIST_VARS+=		fam
 .if !empty(PKG_OPTIONS:Mfam)
 .  include "../../mk/fam.buildlink3.mk"
 CONFIGURE_ARGS+=	--enable-fam
-PLIST_SUBST+=		FAM=
+PLIST.fam=		yes
 .else
 CONFIGURE_ARGS+=	--disable-fam
-PLIST_SUBST+=		FAM="@comment "
 .endif
 
 ###
@@ -92,13 +92,13 @@ CONFIGURE_ARGS+=	--without-ldap
 ###
 ### Support PAM authentication and build smbpass and winbind PAM modules.
 ###
+PLIST_VARS+=		pam
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../security/PAM/module.mk"
 CONFIGURE_ARGS+=	--with-pam
 CONFIGURE_ARGS+=	--with-pam_smbpass
 CONFIGURE_ARGS+=	--with-pammodulesdir=${PAM_INSTMODULEDIR}
-PLIST_SUBST+=		PAM_SMBPASS=lib/security/pam_smbpass.so
-PLIST_SUBST+=		PAM=
+PLIST.pam=		yes
 INSTALLATION_DIRS+=	${EGDIR}/pam_smbpass
 
 .PHONY: samba-pam-smbpass-install
@@ -110,15 +110,13 @@ samba-pam-smbpass-install:
 		${INSTALL_DATA} $${f} \
 			${DESTDIR}${PREFIX}/${EGDIR}/pam_smbpass/$${f};	\
 	done
-.else
-PLIST_SUBST+=		PAM_SMBPASS="@comment no PAM smbpass module"
-PLIST_SUBST+=		PAM="@comment "
 .endif
 
 ###
 ### Support querying a PDC for domain user and group information, e.g.,
 ### through NSS or PAM.
 ###
+PLIST_VARS+=		winbind
 .if !empty(PKG_OPTIONS:Mwinbind)
 CONFIGURE_ARGS+=	--with-winbind
 
@@ -128,14 +126,7 @@ SAMBA_STATIC_MODULES:=	${SAMBA_STATIC_MODULES},idmap_ad
 .  endif
 
 WINBINDD_RCD_SCRIPT=	winbindd
-PLIST_SUBST+=		WINBIND=
-
-# Install the PAM winbind module if we're also building with PAM support.
-.  if empty(PKG_OPTIONS:Mpam)
-PLIST_SUBST+=	PAM_WINBIND="@comment no PAM winbind module"
-.  else
-PLIST_SUBST+=	PAM_WINBIND=lib/security/pam_winbind.so
-.  endif
+PLIST.winbind=		yes
 
 # Install the NSS winbind module if it exists.
 PLIST_SUBST+=		NSS_WINBIND=${NSS_WINBIND:Q}
@@ -174,10 +165,8 @@ samba-nss-wins-install:
 	${TEST} ! -f $$lib || ${INSTALL_LIB} $$lib ${DESTDIR}${PREFIX:Q}/lib
 .else
 CONFIGURE_ARGS+=	--without-winbind
-PLIST_SUBST+=		WINBIND="@comment "
-PLIST_SUBST+=		PAM_WINBIND="@comment no PAM winbind module"
-PLIST_SUBST+=		NSS_WINBIND="@comment no NSS winbind module"
-PLIST_SUBST+=		NSS_WINS="@comment no NSS WINS module"
+PLIST_SUBST+=		NSS_WINBIND="no NSS winbind module"
+PLIST_SUBST+=		NSS_WINS="no NSS WINS module"
 .endif
 
 ###