- Add an empty directory to plist to fix staging.

- Fix build for 8.x on amd64. [1]
- Use tar(1) to extract all distfiles. [2]

PR:		194988 [1]
Submitted by:	Mikhail T. (mi at aldan dot algebra dot com) [2]

2 files changed, 17 insertions, 4 deletions

diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 8179fdde74b0..4ccd7d83f4c2 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -2,14 +2,14 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
 		LOCAL/jkim:jdk,jtreg
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 DISTNAME=	${PORTNAME}-${JDK_MAJOR_VERSION}-src-b${DIST_BUILD_NUMBER}-03_mar_2014
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:jdk
+DISTFILES=	${DISTNAME}.zip:jdk
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -26,7 +26,7 @@ LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib \
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 
-USES=		compiler:features dos2unix gmake iconv pkgconfig shebangfix zip
+USES=		compiler:features dos2unix gmake iconv pkgconfig shebangfix
 USE_AUTOTOOLS=	autoconf
 USE_XORG=	x11 xext xi xrender xt xtst
 
@@ -123,7 +123,7 @@ TEST_DESC=		Run regression tests
 RELEASE_CONFIGURE_ON=	--disable-debug-symbols
 TEST_ALL_TARGET=	test
 TEST_CONFIGURE_ON=	--with-jtreg=${WRKDIR}/jtreg
-TEST_DISTFILES=		jtreg${JTREG_VERSION}-${JTREG_BUILD_NUMBER}.tar.gz:jtreg
+TEST_DISTFILES=		jtreg${JTREG_VERSION}-${JTREG_BUILD_NUMBER}${EXTRACT_SUFX}:jtreg
 .else
 CONFIGURE_ARGS+=	--disable-debug-symbols
 JAVAVMS_COMMENT+=	JRE
@@ -229,11 +229,13 @@ do-install:
 	    ${FIND} bin jre/bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \
 	    ${CHMOD} ${BINMODE} jre/lib/${ARCH}/jexec \
 	    jre/lib/${ARCH}/jspawnhelper lib/${ARCH}/jexec
+	@${ECHO} "@dir ${INSTALLDIR}/jre/lib/applet" >> ${TMPPLIST}
 .else
 	@cd ${JRE_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
 	    ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \
 	    ${CHMOD} ${BINMODE} lib/${ARCH}/jexec lib/${ARCH}/jspawnhelper
+	@${ECHO} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST}
 .endif
 	@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
 	@${FIND} -s ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
diff --git a/java/openjdk8/files/patch-bsd b/java/openjdk8/files/patch-bsd
index 968b6b09425e..2982ee0c218a 100644
--- a/java/openjdk8/files/patch-bsd
+++ b/java/openjdk8/files/patch-bsd
@@ -2780,6 +2780,17 @@
                     os::current_process_id(), os::current_process_id());
  
        os::fork_and_exec(buf);
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp	2014-11-19 14:08:52.000000000 -0500
++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp	2014-11-19 14:10:18.000000000 -0500
+@@ -1242,7 +1242,7 @@
+ // Helper backtrace functions to store bci|version together.
+ static inline int merge_bci_and_version(int bci, int version) {
+   // only store u2 for version, checking for overflow.
+-  if (version > USHRT_MAX || version < 0) version = MAX_VERSION;
++  if (version > (int)USHRT_MAX || version < 0) version = MAX_VERSION;
+   assert((jushort)bci == bci, "bci should be short");
+   return build_int_from_shorts(version, bci);
+ }
 --- ./hotspot/src/share/vm/opto/node.cpp	Mon Sep 08 12:35:01 2014 -0700
 +++ ./hotspot/src/share/vm/opto/node.cpp	Wed Nov 05 15:01:44 2014 -0800
 @@ -286,6 +286,10 @@