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

3 files changed, 12 insertions, 7 deletions

diff --git a/lang/oracle-jre8/Makefile b/lang/oracle-jre8/Makefile
index 81d112964c8..03a12fcba53 100644
--- a/lang/oracle-jre8/Makefile
+++ b/lang/oracle-jre8/Makefile
@@ -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 @@ CONF_FILES+=	${JAVA_HOME}/lib/${file}.default ${JAVA_HOME}/lib/${file}
 .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 --git a/lang/oracle-jre8/Makefile.common b/lang/oracle-jre8/Makefile.common
index 4df0e1f3814..19203858712 100644
--- a/lang/oracle-jre8/Makefile.common
+++ b/lang/oracle-jre8/Makefile.common
@@ -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 @@ EMUL_PLATFORMS=		darwin-x86_64 linux-i386 linux-x86_64 solaris-i386 solaris-x86_
 
 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+=	""
 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 --git a/lang/oracle-jre8/PLIST.solaris-x86_64 b/lang/oracle-jre8/PLIST.solaris-x86_64
index 56025d11aaf..4180454716e 100644
--- a/lang/oracle-jre8/PLIST.solaris-x86_64
+++ b/lang/oracle-jre8/PLIST.solaris-x86_64
@@ -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/resources.jar
 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