diff options
| author | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-04-12 22:42:57 +0000 |
| commit | 84db467ec7c8386066718011f8d47775d5608811 (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /lang/sun-jre6 | |
| parent | 7082f8c2044621c8641f3c82a2da95c2d442048c (diff) | |
| download | pkgsrc-84db467ec7c8386066718011f8d47775d5608811.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'lang/sun-jre6')
| -rw-r--r-- | lang/sun-jre6/Makefile | 7 | ||||
| -rw-r--r-- | lang/sun-jre6/PLIST.linux-i386 | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lang/sun-jre6/Makefile b/lang/sun-jre6/Makefile index 036bb26b05a..da886590a06 100644 --- a/lang/sun-jre6/Makefile +++ b/lang/sun-jre6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2008/03/12 14:26:33 adrianp Exp $ +# $NetBSD: Makefile,v 1.12 2008/04/12 22:43:03 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce # Note: Update DOWNLOAD_NAME when you update the JRE version @@ -38,11 +38,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-6.zip -PLIST_SUBST+= SUN_JRE6_USE_JCE="" -.else -PLIST_SUBST+= SUN_JRE6_USE_JCE="@comment " +PLIST.jce= yes .endif # Some of the binaries require libX11, so ensure that requirement is diff --git a/lang/sun-jre6/PLIST.linux-i386 b/lang/sun-jre6/PLIST.linux-i386 index e1065e33216..6ef37fc87be 100644 --- a/lang/sun-jre6/PLIST.linux-i386 +++ b/lang/sun-jre6/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-i386,v 1.6 2008/03/05 22:32:09 tnn Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.7 2008/04/12 22:43:03 jlam Exp $ bin/sun6-java bin/sun6-javaws bin/sun6-keytool @@ -239,8 +239,8 @@ java/sun-6/lib/psfont.properties.ja.default java/sun-6/lib/psfontj2d.properties.default java/sun-6/lib/resources.jar java/sun-6/lib/rt.jar -${SUN_JRE6_USE_JCE}java/sun-6/lib/security/COPYRIGHT.html -${SUN_JRE6_USE_JCE}java/sun-6/lib/security/README.txt +${PLIST.jce}java/sun-6/lib/security/COPYRIGHT.html +${PLIST.jce}java/sun-6/lib/security/README.txt java/sun-6/lib/security/US_export_policy.jar java/sun-6/lib/security/cacerts java/sun-6/lib/security/java.policy |