From 9ff693053b2b42cd6a29b886e071ad01acdeefe2 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/openssl/PLIST.common |  8 ++++----
 security/openssl/options.mk   | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'security/openssl')

diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common
index 6d6a0641b8d..6cf4171b92d 100644
--- a/security/openssl/PLIST.common
+++ b/security/openssl/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.12 2008/01/17 06:42:47 tnn Exp $
+@comment $NetBSD: PLIST.common,v 1.13 2008/04/12 22:43:12 jlam Exp $
 bin/c_rehash
 bin/openssl
 include/openssl/aes.h
@@ -29,14 +29,14 @@ include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp.h
 include/openssl/hmac.h
-${IDEA}include/openssl/idea.h
+${PLIST.idea}include/openssl/idea.h
 include/openssl/krb5_asn.h
 include/openssl/kssl.h
 include/openssl/lhash.h
 include/openssl/md2.h
 include/openssl/md4.h
 include/openssl/md5.h
-${MDC2}include/openssl/mdc2.h
+${PLIST.mdc2}include/openssl/mdc2.h
 include/openssl/obj_mac.h
 include/openssl/objects.h
 include/openssl/ocsp.h
@@ -52,7 +52,7 @@ include/openssl/pqueue.h
 include/openssl/rand.h
 include/openssl/rc2.h
 include/openssl/rc4.h
-${RC5}include/openssl/rc5.h
+${PLIST.rc5}include/openssl/rc5.h
 include/openssl/ripemd.h
 include/openssl/rsa.h
 include/openssl/safestack.h
diff --git a/security/openssl/options.mk b/security/openssl/options.mk
index 47e309ff069..25696de0f5a 100644
--- a/security/openssl/options.mk
+++ b/security/openssl/options.mk
@@ -1,11 +1,14 @@
-# $NetBSD: options.mk,v 1.4 2008/01/17 06:42:48 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.openssl
 PKG_SUPPORTED_OPTIONS=	idea mdc2 rc5
+
 .include "../../mk/bsd.options.mk"
 
 OPENSSL_LICENSE=	# empty
 
+PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
+
 ###
 ### Support for the IDEA algorithm
 ###	US Patent: 5214703
@@ -14,10 +17,9 @@ OPENSSL_LICENSE=	# empty
 ###
 .if !empty(PKG_OPTIONS:Midea)
 OPENSSL_LICENSE+=	idea-license
-PLIST_SUBST+=		IDEA=
+PLIST.idea=		yes
 .else
 CONFIGURE_ARGS+=	no-idea
-PLIST_SUBST+=		IDEA="@comment "
 .endif
 
 ###
@@ -28,10 +30,9 @@ PLIST_SUBST+=		IDEA="@comment "
 # A license file is needed.
 OPENSSL_LICENSE+=	mdc2-nonlicense
 CONFIGURE_ARGS+=	enable-mdc2
-PLIST_SUBST+=		MDC2=
+PLIST.mdc2=		yes
 .else
 CONFIGURE_ARGS+=	no-mdc2
-PLIST_SUBST+=		MDC2="@comment "
 .endif
 
 ###
@@ -42,10 +43,9 @@ PLIST_SUBST+=		MDC2="@comment "
 # A license file is needed.
 OPENSSL_LICENSE+=	rc5-nonlicense
 CONFIGURE_ARGS+=	enable-rc5
-PLIST_SUBST+=		RC5=
+PLIST.rc5=		yes
 .else
 CONFIGURE_ARGS+=	no-rc5
-PLIST_SUBST+=		RC5="@comment "
 .endif
 
 .if !empty(OPENSSL_LICENSE)
-- 
cgit v1.2.3