pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/openjdk7 Bump PKGREVISION



details:   https://anonhg.NetBSD.org/pkgsrc/rev/30dc89026a8d
branches:  trunk
changeset: 641700:30dc89026a8d
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sat Nov 15 12:10:54 2014 +0000

description:
Bump PKGREVISION

* Enable Unlimited JCE support without Oracle's binary with jre-jce option.
  Thank you, fhajny@.

diffstat:

 lang/openjdk7/Makefile   |   3 ++-
 lang/openjdk7/options.mk |  27 +++++----------------------
 2 files changed, 7 insertions(+), 23 deletions(-)

diffs (55 lines):

diff -r 50d2de116308 -r 30dc89026a8d lang/openjdk7/Makefile
--- a/lang/openjdk7/Makefile    Sat Nov 15 07:33:36 2014 +0000
+++ b/lang/openjdk7/Makefile    Sat Nov 15 12:10:54 2014 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2014/11/03 12:25:36 ryoon Exp $
+# $NetBSD: Makefile,v 1.79 2014/11/15 12:10:54 ryoon Exp $
 
 DISTNAME=      openjdk-1.7.71-20141102
 PKGNAME=       openjdk7-1.7.71
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_LOCAL:=openjdk7/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 50d2de116308 -r 30dc89026a8d lang/openjdk7/options.mk
--- a/lang/openjdk7/options.mk  Sat Nov 15 07:33:36 2014 +0000
+++ b/lang/openjdk7/options.mk  Sat Nov 15 12:10:54 2014 +0000
@@ -1,33 +1,16 @@
-# $NetBSD: options.mk,v 1.5 2014/06/14 22:44:53 ryoon Exp $
+# $NetBSD: options.mk,v 1.6 2014/11/15 12:10:54 ryoon Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.openjdk7
-PKG_SUPPORTED_OPTIONS=         sun-jre-jce # jdk-zero-vm
-PKG_SUGGESTED_OPTIONS=         #
+PKG_SUPPORTED_OPTIONS=         jre-jce # jdk-zero-vm
+PKG_SUGGESTED_OPTIONS=         jre-jce
 
 .include "../../mk/bsd.options.mk"
 
 ###
 ### Java(TM) Cryptography Extension (JCE)
 ###
-.if !empty(PKG_OPTIONS:Msun-jre-jce) || make(distinfo) || make(mdi)
-JCE_DISTFILE=  UnlimitedJCEPolicyJDK7.zip
-DISTFILES+=    ${JCE_DISTFILE}
-EXTRACT_ONLY+= ${JCE_DISTFILE}
-PLIST.jce=     yes
-USE_TOOLS+=    pax
-#
-.  if !exists(${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE})
-FETCH_MESSAGE+= "Please download the Java(TM) Cryptography Extension (JCE) Unlimited"
-FETCH_MESSAGE+= "Strength Jurisdiction Policy Files 7 '${JCE_DISTFILE}' from:"
-FETCH_MESSAGE+= "      http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html";
-FETCH_MESSAGE+= " and place it in:"
-FETCH_MESSAGE+= "       ${DISTDIR}/${DIST_SUBDIR}/${JCE_DISTFILE}"
-FETCH_MESSAGE+= ""
-FETCH_MESSAGE+= " Then resume this build by running '"${MAKE:Q}"' again."
-.  endif
-#
-post-install:
-       cd ${WRKDIR}/UnlimitedJCEPolicy && pax -rw -pp . ${DESTDIR}${JAVA_HOME}/jre/lib/security
+.if !empty(PKG_OPTIONS:Mjre-jce)
+MAKE_ENV+=     UNLIMITED_CRYPTO=true
 .endif
 
 # this option builds a JVM without assembly optimisation. Useful for porting.



Home | Main Index | Thread Index | Old Index