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.

---
 security/heimdal/Makefile   | 7 +++----
 security/heimdal/PLIST      | 8 ++++----
 security/heimdal/options.mk | 7 +++----
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'security/heimdal')

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index ef25d742f9e..3bf7fe286f9 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2008/03/04 22:37:46 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2008/04/12 22:43:09 jlam Exp $
 
 DISTNAME=	heimdal-1.1
 CATEGORIES=	security
@@ -52,10 +52,9 @@ CONFIGURE_ENV.SunOS+=	ac_cv_header_vis_h=no
 CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.readline}/include/readline
 
+PLIST_VARS+=		afskauth
 .if ${OPSYS} == "IRIX"
-PLIST_SUBST+=		IF_IRIX=""
-.else
-PLIST_SUBST+=		IF_IRIX="@comment "
+PLIST.afskauth=		yes
 .endif
 
 OWN_DIRS_PERMS=		${HEIMDAL_HDB_DIR} ${ROOT_USER} ${ROOT_GROUP} 0700
diff --git a/security/heimdal/PLIST b/security/heimdal/PLIST
index 9099fee3228..a119cb9d6c0 100644
--- a/security/heimdal/PLIST
+++ b/security/heimdal/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2008/02/28 08:14:41 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:09 jlam Exp $
 bin/afslog
 bin/compile_et
 bin/gss
@@ -88,7 +88,7 @@ include/krb5/ss/ss.h
 include/krb5/xdbm.h
 info/heimdal.info
 info/hx509.info
-${IF_IRIX}lib/afskauthlib.so
+${PLIST.afskauth}lib/afskauthlib.so
 lib/libasn1.la
 lib/libcom_err.la
 lib/libeditline.la
@@ -825,11 +825,11 @@ sbin/iprop-log
 sbin/kadmin
 sbin/kstash
 sbin/ktutil
-${LDAP}share/examples/heimdal/hdb.schema
+${PLIST.ldap}share/examples/heimdal/hdb.schema
 share/examples/rc.d/kadmind
 share/examples/rc.d/kcm
 share/examples/rc.d/kdc
 share/examples/rc.d/kpasswdd
-${LDAP}@dirrm share/examples/heimdal
+${PLIST.ldap}@dirrm share/examples/heimdal
 @dirrm include/krb5/kadm5
 @dirrm include/krb5/ss
diff --git a/security/heimdal/options.mk b/security/heimdal/options.mk
index b1c27bbcc44..8e7559aa27a 100644
--- a/security/heimdal/options.mk
+++ b/security/heimdal/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2008/02/28 14:11:55 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2008/04/12 22:43:10 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.heimdal
 PKG_SUPPORTED_OPTIONS=	inet6 kerberos-prefix-cmds ldap
@@ -18,18 +18,17 @@ CONFIGURE_ARGS+=	--without-ipv6
 ###
 ### Support using LDAP as a KDC backend.
 ###
+PLIST_VARS+=		ldap
 .if !empty(PKG_OPTIONS:Mldap)
 .  include "../../databases/openldap-client/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-openldap=${BUILDLINK_PREFIX.openldap-client}
-PLIST_SUBST+=		LDAP=""
+PLIST.ldap=		yes
 
 post-install: heimdal-ldap-schema
 heimdal-ldap-schema:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/heimdal
 	${INSTALL_DATA} ${WRKSRC}/lib/hdb/hdb.schema			\
 		${DESTDIR}${PREFIX}/share/examples/heimdal
-.else
-PLIST_SUBST+=		LDAP="@comment "
 .endif
 
 ###
-- 
cgit v1.2.3