[pkgsrc/trunk]: pkgsrc Convert sun-jre14 and sun-jre15 to use the options fra...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fc70828db9a2
branches:  trunk
changeset: 498137:fc70828db9a2
user:      dillo <dillo%pkgsrc.org@localhost>
date:      Sat Aug 13 11:25:14 2005 +0000

description:
Convert sun-jre14 and sun-jre15 to use the options framework.

diffstat:

 lang/sun-jre14/Makefile         |  14 +++++++++-----
 lang/sun-jre15/Makefile         |  14 +++++++++-----
 mk/defaults/mk.conf             |  14 +-------------
 mk/defaults/options.description |   1 +
 4 files changed, 20 insertions(+), 23 deletions(-)

diffs (121 lines):

diff -r dbcbfc60196e -r fc70828db9a2 lang/sun-jre14/Makefile
--- a/lang/sun-jre14/Makefile   Sat Aug 13 11:20:02 2005 +0000
+++ b/lang/sun-jre14/Makefile   Sat Aug 13 11:25:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/18 15:39:04 jschauma Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/13 11:25:14 dillo Exp $
 
 # Note: Regen distinfo with SUN_JRE14_USE_JCE=YES
 
@@ -34,12 +34,16 @@
 SUPPORT_FILES+=        ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=       PKG_OPTIONS.sun-jre14
+PKG_SUPPORTED_OPTIONS= sun-jre-jce
+# can be removed after 2005Q3
+PKG_OPTIONS_LEGACY_VARS=SUN_JRE14_USE_JCE:sun-jre-jce
 
-BUILD_DEFS+=           SUN_JRE14_USE_JCE
+.include "../../mk/bsd.options.mk"
+
 PLIST_SRC=             ${WRKDIR}/PLIST
 
-.if !empty(SUN_JRE14_USE_JCE:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_4_2.zip
 .endif
 
@@ -47,7 +51,7 @@
        cd ${WRKSRC}/lib; for file in ${SFILES}; do                     \
                ${MV} -f $$file $$file.default;                         \
        done
-.if !empty(SUN_JRE14_USE_JCE:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Msun-jre-jce)
        cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
        ${SED} 's/@SUN_JRE14_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .else
diff -r dbcbfc60196e -r fc70828db9a2 lang/sun-jre15/Makefile
--- a/lang/sun-jre15/Makefile   Sat Aug 13 11:20:02 2005 +0000
+++ b/lang/sun-jre15/Makefile   Sat Aug 13 11:25:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/21 18:23:16 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/08/13 11:25:14 dillo Exp $
 
 # Note: Regen distinfo with SUN_JRE15_USE_JCE=YES
 
@@ -26,7 +26,12 @@
 SUPPORT_FILES+=        ${JAVA_HOME}/lib/${FILE}.default ${JAVA_HOME}/lib/${FILE}
 .endfor
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=       PKG_OPTIONS.sun-jre15
+PKG_SUPPORTED_OPTIONS= sun-jre-jce
+# can be removed after 2005Q3
+PKG_OPTIONS_LEGACY_VARS=SUN_JRE15_USE_JCE:sun-jre-jce
+
+.include "../../mk/bsd.options.mk"
 
 HEADER_EXTRA_TMPL=     ${WRKDIR}/HEADER.tmpl
 INSTALL_EXTRA_TMPL=    ${PKGDIR}/INSTALL.tmpl
@@ -34,10 +39,9 @@
 FILES_SUBST+=          JAVA_HOME=${JAVA_HOME:Q}
 FILES_SUBST+=          MACHINE_ARCH=${MACHINE_ARCH:Q}
 
-BUILD_DEFS+=           SUN_JRE15_USE_JCE
 PLIST_SRC=             ${WRKDIR}/PLIST
 
-.if !empty(SUN_JRE15_USE_JCE:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Msun-jre-jce)
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} jce_policy-1_5_0.zip
 .endif
 
@@ -51,7 +55,7 @@
                ${MV} -f $$file $$file.default;                         \
        done
        @${ECHO} 'SUPPORT_FILES="${SUPPORT_FILES}"' >${HEADER_EXTRA_TMPL}
-.if !empty(SUN_JRE15_USE_JCE:M[Yy][Ee][Ss])
+.if !empty(PKG_OPTIONS:Msun-jre-jce)
        cd ${WRKDIR}/jce ; pax -rw -pe -v . ${WRKSRC}/lib/security
        ${SED} 's/@SUN_JRE15_USE_JCE@//' ${PKGDIR}/PLIST > ${PLIST_SRC}
 .else
diff -r dbcbfc60196e -r fc70828db9a2 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Sat Aug 13 11:20:02 2005 +0000
+++ b/mk/defaults/mk.conf       Sat Aug 13 11:25:14 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.77 2005/08/07 16:37:11 wiz Exp $
+# $NetBSD: mk.conf,v 1.78 2005/08/13 11:25:14 dillo Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -1728,18 +1728,6 @@
 # Possible: pawd, pwd
 # Default: pwd
 
-SUN_JRE14_USE_JCE?= NO
-# Whether to include the Java Cryptography Extension (JCE) Unlimited Strength
-# Jurisdiction Policy Files in the sun-jre14 package
-# Possible: YES or NO.
-# Default: NO
-
-SUN_JRE15_USE_JCE?= NO
-# Whether to include the Java Cryptography Extension (JCE) Unlimited Strength
-# Jurisdiction Policy Files in the sun-jre15 package
-# Possible: YES or NO.
-# Default: NO
-
 .if empty(MACHINE_PLATFORM:MNetBSD-1*-*)
 SUSE_PREFER?=  9.1
 .else
diff -r dbcbfc60196e -r fc70828db9a2 mk/defaults/options.description
--- a/mk/defaults/options.description   Sat Aug 13 11:20:02 2005 +0000
+++ b/mk/defaults/options.description   Sat Aug 13 11:25:14 2005 +0000
@@ -237,6 +237,7 @@
 static 
 subshell       
 suexec 
+sun-jre-jce            Use unlimited strength cryptograpy extension.
 svn    
 syncdir                        Force synchronous link() and related syscalls.
 tcpd