From b3297776b5ca9d6f7935980a8f897bba61d16c80 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 2 Oct 2017 16:24:18 +0000
Subject: [PATCH] Update arm distfiles to sync. with amd64 and i386.

---
 java/bootstrap-openjdk8/Makefile        |  7 +---
 java/bootstrap-openjdk8/Makefile.update |  9 +++-
 java/bootstrap-openjdk8/distinfo.arm    |  6 +--
 java/bootstrap-openjdk8/pkg-plist.arm   | 56 -------------------------
 4 files changed, 12 insertions(+), 66 deletions(-)
 delete mode 100644 java/bootstrap-openjdk8/pkg-plist.arm

diff --git a/java/bootstrap-openjdk8/Makefile b/java/bootstrap-openjdk8/Makefile
index 9d6c5ea39790..a27b8c3ec727 100644
--- a/java/bootstrap-openjdk8/Makefile
+++ b/java/bootstrap-openjdk8/Makefile
@@ -16,7 +16,7 @@ ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${JDK_ARCH}
 DISTVERSION_amd64=	r450802
-DISTVERSION_arm=	r444448
+DISTVERSION_arm=	r450802
 DISTVERSION_i386=	r450802
 
 JDK_ARCH=	${ARCH:C/armv.*/arm/}
@@ -34,16 +34,11 @@ INSTALLDIR=	${STAGEDIR}${PREFIX}/${JDK_ROOT}
 
 .if ${ARCH:Marmv*}
 RUN_DEPENDS+=	${LOCALBASE}/lib/libffi.so.6:devel/libffi
-RUN_DEPENDS+=	java-zoneinfo>0:java/java-zoneinfo
-PLIST=		${PKGDIR}/pkg-plist.arm
 .endif
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${INSTALLDIR}
-.if ${ARCH:Marmv*}
-	@cd ${WRKSRC} && ${COPYTREE_BIN} jre/bin ${INSTALLDIR}
-.endif
 
 update:
 	@${MAKE} -f ${.CURDIR}/Makefile.update \
diff --git a/java/bootstrap-openjdk8/Makefile.update b/java/bootstrap-openjdk8/Makefile.update
index ce468ae2a3bd..43c2d682ce99 100644
--- a/java/bootstrap-openjdk8/Makefile.update
+++ b/java/bootstrap-openjdk8/Makefile.update
@@ -3,7 +3,6 @@
 JDK_ARCH?=	${ARCH:C/armv.*/arm/}
 JDK_PORT?=	openjdk8
 JDK_ROOT?=	bootstrap-${JDK_PORT}
-TARGET_OS?=	10
 
 .if !defined(PORTSDIR)
 .if exists(${.CURDIR}/../${JDK_PORT}/Makefile)
@@ -41,6 +40,14 @@ BUILD_ENV=	__MAKE_CONF=/dev/null PATH="${PATH}"
 BUILD_ENV+=	java_openjdk8_UNSET="ALSA X11"
 JDK_BUILD_ARGS=	${BUILD_ARGS}
 
+.if !defined(TARGET_OS)
+.if ${ARCH:Marmv*}
+TARGET_OS=	11
+.else
+TARGET_OS=	10
+.endif
+.endif
+
 all:
 	@${ECHO} ""
 	@${ECHO} "=============================================================="
diff --git a/java/bootstrap-openjdk8/distinfo.arm b/java/bootstrap-openjdk8/distinfo.arm
index bba2a5e5b5e8..4af7816eeb33 100644
--- a/java/bootstrap-openjdk8/distinfo.arm
+++ b/java/bootstrap-openjdk8/distinfo.arm
@@ -1,3 +1,3 @@
-TIMESTAMP = 1506551470
-SHA256 (openjdk8-arm-r444448.tar.xz) = 9ebe082068fd919ae956c5b604a9db1e4199afc00875eb890ff6c132ebe6d371
-SIZE (openjdk8-arm-r444448.tar.xz) = 22669660
+TIMESTAMP = 1506851046
+SHA256 (openjdk8-arm-r450802.tar.xz) = f85d192ef73d40c08bea9f3fea5fe59c1d1e145004e4942fcee48b4769062532
+SIZE (openjdk8-arm-r450802.tar.xz) = 27149448
diff --git a/java/bootstrap-openjdk8/pkg-plist.arm b/java/bootstrap-openjdk8/pkg-plist.arm
deleted file mode 100644
index 900acead941e..000000000000
--- a/java/bootstrap-openjdk8/pkg-plist.arm
+++ /dev/null
@@ -1,56 +0,0 @@
-%%JDK_ROOT%%/ASSEMBLY_EXCEPTION
-%%JDK_ROOT%%/LICENSE
-%%JDK_ROOT%%/THIRD_PARTY_README
-%%JDK_ROOT%%/bin/idlj
-%%JDK_ROOT%%/bin/jar
-%%JDK_ROOT%%/bin/java
-%%JDK_ROOT%%/bin/javac
-%%JDK_ROOT%%/bin/javah
-%%JDK_ROOT%%/bin/javap
-%%JDK_ROOT%%/bin/native2ascii
-%%JDK_ROOT%%/bin/rmic
-%%JDK_ROOT%%/include/freebsd/jni_md.h
-%%JDK_ROOT%%/include/jni.h
-%%JDK_ROOT%%/jre/ASSEMBLY_EXCEPTION
-%%JDK_ROOT%%/jre/LICENSE
-%%JDK_ROOT%%/jre/THIRD_PARTY_README
-%%JDK_ROOT%%/jre/bin/java
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/jvm.cfg
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libawt.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libawt_headless.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libawt_xawt.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libfontmanager.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libjava.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libjpeg.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/liblcms.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libnet.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libnio.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libverify.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libzip.so
-%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/server/libjvm.so
-%%JDK_ROOT%%/jre/lib/charsets.jar
-%%JDK_ROOT%%/jre/lib/cmm/CIEXYZ.pf
-%%JDK_ROOT%%/jre/lib/cmm/GRAY.pf
-%%JDK_ROOT%%/jre/lib/cmm/LINEAR_RGB.pf
-%%JDK_ROOT%%/jre/lib/cmm/PYCC.pf
-%%JDK_ROOT%%/jre/lib/cmm/sRGB.pf
-%%JDK_ROOT%%/jre/lib/currency.data
-%%JDK_ROOT%%/jre/lib/ext/dnsns.jar
-%%JDK_ROOT%%/jre/lib/ext/localedata.jar
-%%JDK_ROOT%%/jre/lib/ext/meta-index
-%%JDK_ROOT%%/jre/lib/ext/sunjce_provider.jar
-%%JDK_ROOT%%/jre/lib/ext/sunpkcs11.jar
-%%JDK_ROOT%%/jre/lib/fontconfig.bfc
-%%JDK_ROOT%%/jre/lib/jce.jar
-%%JDK_ROOT%%/jre/lib/jsse.jar
-%%JDK_ROOT%%/jre/lib/logging.properties
-%%JDK_ROOT%%/jre/lib/meta-index
-%%JDK_ROOT%%/jre/lib/net.properties
-%%JDK_ROOT%%/jre/lib/resources.jar
-%%JDK_ROOT%%/jre/lib/rt.jar
-%%JDK_ROOT%%/jre/lib/security/java.security
-%%JDK_ROOT%%/jre/lib/tzdb.dat
-%%JDK_ROOT%%/jre/lib/zi
-%%JDK_ROOT%%/lib/%%JDK_ARCH%%/jli/libjli.so
-%%JDK_ROOT%%/lib/ct.sym
-%%JDK_ROOT%%/lib/tools.jar