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-jre15 | |
| 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-jre15')
| -rw-r--r-- | lang/sun-jre15/Makefile | 7 | ||||
| -rw-r--r-- | lang/sun-jre15/PLIST.linux-i386 | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/lang/sun-jre15/Makefile b/lang/sun-jre15/Makefile index abd76a8f0ad..6ac63037699 100644 --- a/lang/sun-jre15/Makefile +++ b/lang/sun-jre15/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2008/03/31 22:10:07 tnn Exp $ +# $NetBSD: Makefile,v 1.53 2008/04/12 22:43:03 jlam Exp $ # Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce @@ -36,11 +36,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_5_0.zip -PLIST_SUBST+= SUN_JRE15_USE_JCE="" -.else -PLIST_SUBST+= SUN_JRE15_USE_JCE="@comment " +PLIST.jce= yes .endif # Some of the binaries require libX11, so ensure that requirement is diff --git a/lang/sun-jre15/PLIST.linux-i386 b/lang/sun-jre15/PLIST.linux-i386 index 2837d028a19..0090e7260f5 100644 --- a/lang/sun-jre15/PLIST.linux-i386 +++ b/lang/sun-jre15/PLIST.linux-i386 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.linux-i386,v 1.6 2008/01/07 19:56:27 tron Exp $ +@comment $NetBSD: PLIST.linux-i386,v 1.7 2008/04/12 22:43:03 jlam Exp $ bin/sun15-java bin/sun15-javaws bin/sun15-keytool @@ -185,8 +185,8 @@ java/sun-1.5/lib/plugin.jar java/sun-1.5/lib/psfont.properties.ja.default java/sun-1.5/lib/psfontj2d.properties.default java/sun-1.5/lib/rt.jar -${SUN_JRE15_USE_JCE}java/sun-1.5/lib/security/COPYRIGHT.html -${SUN_JRE15_USE_JCE}java/sun-1.5/lib/security/README.txt +${PLIST.jce}java/sun-1.5/lib/security/COPYRIGHT.html +${PLIST.jce}java/sun-1.5/lib/security/README.txt java/sun-1.5/lib/security/US_export_policy.jar java/sun-1.5/lib/security/cacerts java/sun-1.5/lib/security/java.policy |