[pkgsrc/trunk]: pkgsrc/lang oracle-j{re, dk}8: Fix SunOS, print-PLIST, and SSP.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/99a3c60b00ce
branches:  trunk
changeset: 372643:99a3c60b00ce
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Dec 13 09:34:48 2017 +0000

description:
oracle-j{re,dk}8: Fix SunOS, print-PLIST, and SSP.

diffstat:

 lang/oracle-jdk8/Makefile             |  6 +-----
 lang/oracle-jre8/Makefile             |  3 +--
 lang/oracle-jre8/Makefile.common      |  8 ++++++--
 lang/oracle-jre8/PLIST.solaris-x86_64 |  8 +++++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diffs (94 lines):

diff -r 1e3a44b1ee72 -r 99a3c60b00ce lang/oracle-jdk8/Makefile
--- a/lang/oracle-jdk8/Makefile Wed Dec 13 09:01:04 2017 +0000
+++ b/lang/oracle-jdk8/Makefile Wed Dec 13 09:34:48 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/09/19 06:57:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.5 2017/12/13 09:34:48 jperkin Exp $
 
 # Note: This must be kept in sync with the oracle-jre8 package
 # Note: make sure you include sums for both the x86_64 and the x86_32
@@ -22,10 +22,6 @@
 
 .include "../../lang/oracle-jre8/Makefile.common"
 
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
-CHECK_SHLIBS_SUPPORTED=        no
-.endif
-
 PLIST_SRC=     PLIST.${DIST_OS}-${EMUL_ARCH}
 PLIST_SUBST+=  JAVA_ARCH="${JAVA_ARCH}"
 
diff -r 1e3a44b1ee72 -r 99a3c60b00ce lang/oracle-jre8/Makefile
--- a/lang/oracle-jre8/Makefile Wed Dec 13 09:01:04 2017 +0000
+++ b/lang/oracle-jre8/Makefile Wed Dec 13 09:34:48 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2017/06/01 13:30:25 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2017/12/13 09:34:48 jperkin Exp $
 
 # Note: Regen distinfo with PKG_OPTIONS.oracle-jre8+=oracle-jre-jce
 # Note: Update DOWNLOAD_NAME when you update the JRE version
@@ -42,7 +42,6 @@
 .endfor
 
 CHECK_FILES_SKIP+=     ${JAVA_HOME}/lib/${JAVA_ARCH}/client/classes.jsa
-CHECK_SHLIBS_SUPPORTED=        NO
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.oracle-jre8
 PKG_SUPPORTED_OPTIONS= oracle-jre-jce
diff -r 1e3a44b1ee72 -r 99a3c60b00ce lang/oracle-jre8/Makefile.common
--- a/lang/oracle-jre8/Makefile.common  Wed Dec 13 09:01:04 2017 +0000
+++ b/lang/oracle-jre8/Makefile.common  Wed Dec 13 09:34:48 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2017/11/28 05:15:27 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.12 2017/12/13 09:34:48 jperkin Exp $
 # used by lang/oracle-jre8/Makefile
 # used by lang/oracle-jdk8/Makefile
 
@@ -20,8 +20,10 @@
 
 USE_TOOLS+=    pax
 
-# pre-built binaries without RELRO
+# Contains pre-built binaries
 CHECK_RELRO_SUPPORTED= no
+CHECK_SHLIBS_SUPPORTED=        no
+CHECK_SSP_SUPPORTED=   no
 
 # JDK8 Update number
 UPDATE_NUMBER= 152
@@ -84,6 +86,8 @@
 FETCH_MESSAGE+=        " Click Download for '${DOWNLOAD_NAME}', read and accept the"
 FETCH_MESSAGE+=        " license, then choose '${EMUL_OPSYS} tar.gz file'."
 
+PRINT_PLIST_AWK+=      /^java\/.*\/man\// { sub("\\.gz$$", ""); }
+
 do-install:
        ${INSTALL_PROGRAM_DIR} ${DESTDIR}${JAVA_HOME}
        cd ${WRKSRC} && pax -rwp ma . ${DESTDIR}${JAVA_HOME}
diff -r 1e3a44b1ee72 -r 99a3c60b00ce lang/oracle-jre8/PLIST.solaris-x86_64
--- a/lang/oracle-jre8/PLIST.solaris-x86_64     Wed Dec 13 09:01:04 2017 +0000
+++ b/lang/oracle-jre8/PLIST.solaris-x86_64     Wed Dec 13 09:34:48 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.solaris-x86_64,v 1.5 2017/03/11 07:36:10 ryoon Exp $
+@comment $NetBSD: PLIST.solaris-x86_64,v 1.6 2017/12/13 09:34:48 jperkin Exp $
 bin/oracle8-java
 bin/oracle8-javaws
 bin/oracle8-keytool
@@ -145,13 +145,15 @@
 java/oracle-8/lib/rt.jar
 java/oracle-8/lib/sdp/sdp.conf.template
 ${PLIST.jce}java/oracle-8/lib/security/README.txt
-java/oracle-8/lib/security/US_export_policy.jar
 java/oracle-8/lib/security/blacklist
 java/oracle-8/lib/security/blacklisted.certs
 java/oracle-8/lib/security/cacerts
 java/oracle-8/lib/security/java.policy
 java/oracle-8/lib/security/java.security.default
-java/oracle-8/lib/security/local_policy.jar
+java/oracle-8/lib/security/policy/limited/US_export_policy.jar
+java/oracle-8/lib/security/policy/limited/local_policy.jar
+java/oracle-8/lib/security/policy/unlimited/US_export_policy.jar
+java/oracle-8/lib/security/policy/unlimited/local_policy.jar
 java/oracle-8/lib/security/sunpkcs11-solaris.cfg.default
 java/oracle-8/lib/security/trusted.libraries
 java/oracle-8/lib/security/ucrypto-solaris.cfg.default