Wed Aug 3 13:28:35 2011 UTC ()
Set FETCH_MESSAGE for jce only when it is not fetched yet.
fixes PR#44983 and PR#45202.


(obache)
diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/options.mk
cvs diff -r1.1 -r1.2 pkgsrc/lang/openjdk7/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/lang/openjdk7/Attic/options.mk 2010/12/07 22:23:23 1.1
+++ pkgsrc/lang/openjdk7/Attic/options.mk 2011/08/03 13:28:35 1.2
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1# $NetBSD: options.mk,v 1.1 2010/12/07 22:23:23 abs Exp $ 1# $NetBSD: options.mk,v 1.2 2011/08/03 13:28:35 obache Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7 3PKG_OPTIONS_VAR= PKG_OPTIONS.openjdk7
4PKG_SUPPORTED_OPTIONS= sun-jre-jce 4PKG_SUPPORTED_OPTIONS= sun-jre-jce
5PKG_SUGGESTED_OPTIONS= # 5PKG_SUGGESTED_OPTIONS= #
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9### 9###
10### Java(TM) Cryptography Extension (JCE) 10### Java(TM) Cryptography Extension (JCE)
11### 11###
12.if !empty(PKG_OPTIONS:Msun-jre-jce) 12.if !empty(PKG_OPTIONS:Msun-jre-jce)
13JCE_DISTFILE=jce_policy-6.zip 13JCE_DISTFILE=jce_policy-6.zip
14DISTFILES+= ${JCE_DISTFILE} 14DISTFILES+= ${JCE_DISTFILE}
15EXTRACT_ONLY+= ${JCE_DISTFILE} 15EXTRACT_ONLY+= ${JCE_DISTFILE}
16PLIST.jce= yes 16PLIST.jce= yes
17USE_TOOLS+= pax 17USE_TOOLS+= pax
18# 18#
 19.if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE})
19FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited" 20FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited"
20FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 6 '${JCE_DISTFILE}' from:" 21FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 6 '${JCE_DISTFILE}' from:"
21FETCH_MESSAGE+= " http://java.sun.com/javase/downloads/" 22FETCH_MESSAGE+= " http://java.sun.com/javase/downloads/"
22FETCH_MESSAGE+= " and place it in:" 23FETCH_MESSAGE+= " and place it in:"
23FETCH_MESSAGE+= " ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}" 24FETCH_MESSAGE+= " ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}"
24FETCH_MESSAGE+= "" 25FETCH_MESSAGE+= ""
25FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again." 26FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again."
 27.endif
26# 28#
27post-install: 29post-install:
28 cd ${WRKDIR}/jce ; pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security 30 cd ${WRKDIR}/jce ; pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security
29.endif 31.endif