diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 31597853cc377bc7f255d79b8cbdba990fd506a1 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /lang/sun-jre14 | |
| parent | d9176ab5ada46cb1a5d0b147d1c9ac9ba38136d0 (diff) | |
| download | pkgsrc-31597853cc377bc7f255d79b8cbdba990fd506a1.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'lang/sun-jre14')
| -rw-r--r-- | lang/sun-jre14/Makefile | 7 | ||||
| -rw-r--r-- | lang/sun-jre14/PLIST | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lang/sun-jre14/Makefile b/lang/sun-jre14/Makefile index dce8f7f67ff..8574f928f86 100644 --- a/lang/sun-jre14/Makefile +++ b/lang/sun-jre14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2008/03/05 21:50:22 tnn Exp $ +# $NetBSD: Makefile,v 1.48 2008/04/12 22:43:03 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -42,9 +42,10 @@ PKG_SUPPORTED_OPTIONS= sun-jre-jce .include "../../mk/bsd.options.mk" +PLIST_VARS+= jce .if !empty(PKG_OPTIONS:Msun-jre-jce) DISTFILES= ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip -PLIST_SUBST+= SUN_JRE14_USE_JCE="" +PLIST.jce= yes END_MESSAGE= \ "" \ @@ -53,8 +54,6 @@ END_MESSAGE= \ "" \ "Under 'Other Downloads' / 'Java Cryptography Extension'" \ "click 'Download' and choose the .zip file." -.else -PLIST_SUBST+= SUN_JRE14_USE_JCE="@comment " .endif # Some of the binaries require libX11, so ensure that requirement is diff --git a/lang/sun-jre14/PLIST b/lang/sun-jre14/PLIST index f8d203600d5..342bf258309 100644 --- a/lang/sun-jre14/PLIST +++ b/lang/sun-jre14/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2008/03/05 21:50:22 tnn Exp $ +@comment $NetBSD: PLIST,v 1.24 2008/04/12 22:43:03 jlam Exp $ bin/sun14-java bin/sun14-keytool bin/sun14-orbd @@ -187,8 +187,8 @@ java/sun-1.4/lib/plugin.jar java/sun-1.4/lib/psfont.properties.ja.default java/sun-1.4/lib/psfontj2d.properties.default java/sun-1.4/lib/rt.jar -${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/COPYRIGHT.html -${SUN_JRE14_USE_JCE}java/sun-1.4/lib/security/README.txt +${PLIST.jce}java/sun-1.4/lib/security/COPYRIGHT.html +${PLIST.jce}java/sun-1.4/lib/security/README.txt java/sun-1.4/lib/security/US_export_policy.jar java/sun-1.4/lib/security/cacerts java/sun-1.4/lib/security/java.policy |