[pkgsrc/trunk]: pkgsrc/lang Convert remaining instances of SUN_JRE1?_USE_JCE ...

[dillo <dillo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d790889461bd
branches:  trunk
changeset: 498157:d790889461bd
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Sun Aug 14 10:15:55 2005 +0000

description:
Convert remaining instances of SUN_JRE1?_USE_JCE to options framework.
Noted by wiz.

diffstat:

 lang/sun-jre14/Makefile        |   4 ++--
 lang/sun-jre14/Makefile.common |   4 ++--
 lang/sun-jre14/distinfo        |  11 ++++-------
 lang/sun-jre15/Makefile        |   4 ++--
 4 files changed, 10 insertions(+), 13 deletions(-)

diffs (58 lines):

diff -r 65fc5875d52f -r d790889461bd lang/sun-jre14/Makefile
--- a/lang/sun-jre14/Makefile   Sun Aug 14 08:11:47 2005 +0000
+++ b/lang/sun-jre14/Makefile   Sun Aug 14 10:15:55 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2005/08/13 11:25:14 dillo Exp $
+# $NetBSD: Makefile,v 1.26 2005/08/14 10:15:55 dillo Exp $
 
-# Note: Regen distinfo with SUN_JRE14_USE_JCE=YES
+# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=      j2re-1_4_2_08-linux-i586
 PKGNAME=       sun-jre14-2.8
diff -r 65fc5875d52f -r d790889461bd lang/sun-jre14/Makefile.common
--- a/lang/sun-jre14/Makefile.common    Sun Aug 14 08:11:47 2005 +0000
+++ b/lang/sun-jre14/Makefile.common    Sun Aug 14 10:15:55 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/05/10 01:51:13 jschauma Exp $
+# $NetBSD: Makefile.common,v 1.26 2005/08/14 10:15:55 dillo Exp $
 
 CATEGORIES=    lang java
 EXTRACT_SUFX=  .bin
@@ -47,7 +47,7 @@
        ${ECHO} -e ${END_MESSAGE};                                      \
        ${ECHO} "======================================================================"
 
-.if !empty(SUN_JRE14_USE_JCE:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Msun-jre-jce)
 END_MESSAGE="\n The file jce_policy-1_4_2.zip must be fetched into:\n" \
                "    ${DISTDIR}/jce_policy-1_4_2.zip\n\n"               \
                "Under 'Other Downloads' / 'Java Cryptography Extension'\n" \
diff -r 65fc5875d52f -r d790889461bd lang/sun-jre14/distinfo
--- a/lang/sun-jre14/distinfo   Sun Aug 14 08:11:47 2005 +0000
+++ b/lang/sun-jre14/distinfo   Sun Aug 14 10:15:55 2005 +0000
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.16 2005/05/17 06:33:07 veego Exp $
+$NetBSD: distinfo,v 1.17 2005/08/14 10:15:55 dillo Exp $
 
-SHA1 (j2re-1_4_2_08-linux-i586.bin) = 3cfe84935ba4a2a9d193631ea15fc60da5240af5
-RMD160 (j2re-1_4_2_08-linux-i586.bin) = 4cb146c3e7ab23c615630e68916d3fe824b19847
-Size (j2re-1_4_2_08-linux-i586.bin) = 14389429 bytes
-SHA1 (jce_policy-1_4_2.zip) = ea17b649ebcaaf4246e9dd28dbc77926176c64ee
-RMD160 (jce_policy-1_4_2.zip) = 323340fa8a96f315a35b0ebc918731e6fe56c370
-Size (jce_policy-1_4_2.zip) = 12195 bytes
+SHA1 (j2re-1_4_2_09-linux-i586.bin) = dfd56fc4715da10a2b5ad0e4e2938c05914049cb
+RMD160 (j2re-1_4_2_09-linux-i586.bin) = abdc9fcc593e4b00151f3bbbcde9e88842f78c8f
+Size (j2re-1_4_2_09-linux-i586.bin) = 14411078 bytes
diff -r 65fc5875d52f -r d790889461bd lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Sun Aug 14 08:11:47 2005 +0000
+++ b/lang/sun-jre15/Makefile   Sun Aug 14 10:15:55 2005 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2005/08/13 11:25:14 dillo Exp $
+# $NetBSD: Makefile,v 1.17 2005/08/14 10:15:55 dillo Exp $
 
-# Note: Regen distinfo with SUN_JRE15_USE_JCE=YES
+# Note: Regen distinfo with PKG_DEFAULT_OPTIONS+=sun-jre-jce
 
 DISTNAME=      jre-1_5_0_04-linux-i586
 PKGNAME=       sun-jre15-5.0.4