Add support for armv6hf. Tested on Raspberry Pi 2 Model B.

5 files changed, 33 insertions, 31 deletions

diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile
index 9d270d479ce8..4e54f4fa786c 100644
--- a/java/bootstrap-openjdk/Makefile
+++ b/java/bootstrap-openjdk/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	${JDK_NAME}
-PORTVERSION=	${DISTVERSION_${ARCH}}
+PORTVERSION=	${DISTVERSION_${JDK_ARCH}}
 PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	LOCAL/jkim
 PKGNAMEPREFIX=	bootstrap-
-DISTNAME=	${JDK_PORT}-${ARCH}-${PORTVERSION}
+DISTNAME=	${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
 
 MAINTAINER=	jkim@FreeBSD.org
 COMMENT=	Oracle's Java 6 virtual machine release under the GPL v2
@@ -16,19 +16,19 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	java-zoneinfo>0:${PORTSDIR}/java/java-zoneinfo
 BUNDLE_LIBS=	yes
 
-ONLY_FOR_ARCHS=	amd64 i386 armv6
+ONLY_FOR_ARCHS=	amd64 armv6 armv6hf i386
 
-DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
+DISTINFO_FILE=	${.CURDIR}/distinfo.${JDK_ARCH}
 DISTVERSION_amd64=	r351880
+DISTVERSION_arm=	r378760
 DISTVERSION_i386=	r351880
-DISTVERSION_armv6=	r378760
 
+JDK_ARCH=	${ARCH:C/armv6.*/arm/}
 JDK_NAME=	openjdk
-JDK_PORT=	openjdk6
 JDK_ROOT=	bootstrap-${JDK_NAME}
 
 NO_BUILD=	yes
-PLIST_SUB=	ARCH=${ARCH:S/armv6/arm/} JDK_NAME=${JDK_NAME} JDK_ROOT=${JDK_ROOT}
+PLIST_SUB=	JDK_ARCH=${JDK_ARCH} JDK_NAME=${JDK_NAME} JDK_ROOT=${JDK_ROOT}
 USES=		tar:xz
 WRKSRC=		${WRKDIR}/${JDK_ROOT}
 
@@ -43,8 +43,10 @@ PLIST_SUB+=	LIBSTDCXX="@comment "
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "armv6"
+.if ${ARCH:Marmv6*}
 JDK_PORT=	openjdk7
+.else
+JDK_PORT=	openjdk6
 .endif
 
 .if ${ARCH} == "i386"
diff --git a/java/bootstrap-openjdk/distinfo.arm b/java/bootstrap-openjdk/distinfo.arm
new file mode 100644
index 000000000000..6cf9842e6e30
--- /dev/null
+++ b/java/bootstrap-openjdk/distinfo.arm
@@ -0,0 +1,2 @@
+SHA256 (openjdk7-arm-r378760.tar.xz) = 4b4ca5f1ae2d4bd32a969fef4163f165538309672ede83e33116fccfea181c8e
+SIZE (openjdk7-arm-r378760.tar.xz) = 25109864
diff --git a/java/bootstrap-openjdk/distinfo.armv6 b/java/bootstrap-openjdk/distinfo.armv6
deleted file mode 100644
index 1bad2fbfe727..000000000000
--- a/java/bootstrap-openjdk/distinfo.armv6
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (openjdk7-armv6-r378760.tar.xz) = 4b4ca5f1ae2d4bd32a969fef4163f165538309672ede83e33116fccfea181c8e
-SIZE (openjdk7-armv6-r378760.tar.xz) = 25109864
diff --git a/java/bootstrap-openjdk/pkg-plist b/java/bootstrap-openjdk/pkg-plist
index 88c3775538f7..239fc48684eb 100644
--- a/java/bootstrap-openjdk/pkg-plist
+++ b/java/bootstrap-openjdk/pkg-plist
@@ -25,22 +25,22 @@
 %%JDK_ROOT%%/jre/lib/net.properties
 %%JDK_ROOT%%/jre/lib/resources.jar
 %%JDK_ROOT%%/jre/lib/rt.jar
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/jvm.cfg
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libawt.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libfontmanager.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libfreetype.so.6
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjava.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libjpeg.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/liblcms.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libnet.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libnio.so
-%%LIBSTDCXX%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/libstdc++.so.6
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libverify.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/libzip.so
-%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/libjvm.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/headless/libmawt.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/server/libjvm.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/xawt/libmawt.so
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/jvm.cfg
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libawt.so
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libfontmanager.so
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libfreetype.so.6
+%%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
+%%LIBSTDCXX%%%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libstdc++.so.6
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libverify.so
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/libzip.so
+%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/client/libjvm.so
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/headless/libmawt.so
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/server/libjvm.so
+%%JDK_ROOT%%/jre/lib/%%JDK_ARCH%%/xawt/libmawt.so
 %%JDK_ROOT%%/jre/lib/cmm/GRAY.pf
 %%JDK_ROOT%%/jre/lib/cmm/PYCC.pf
 %%JDK_ROOT%%/jre/lib/cmm/sRGB.pf
diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 56e67a3f64a7..e76fc69bc0d8 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -45,7 +45,7 @@ USE_XORG=	x11 xext xi xrender xt xtst
 BUILD_DEPENDS+=	${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 .endif
 
-ONLY_FOR_ARCHS=	amd64 armv6 i386
+ONLY_FOR_ARCHS=	amd64 armv6 armv6hf i386
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \
@@ -189,8 +189,8 @@ JRE_IMAGEDIR=	${JDK_BUILDDIR}/images/j2sdk-image/jre
 .else
 JRE_IMAGEDIR=	${JDK_BUILDDIR}/images/j2re-image
 .endif
-JDK_JVMDIR=	lib/${ARCH:S/armv6/arm/}
-JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/armv6/arm/:S/i386/x86/}
+JDK_JVMDIR=	lib/${ARCH:C/armv6.*/arm/}
+JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:C/armv6.*/arm/:S/i386/x86/}
 INSTALLDIR=	${PREFIX}/${PKGBASE}
 
 NO_CCACHE=		yes
@@ -287,7 +287,7 @@ LIB_DEPENDS+=	libffi.so:${PORTSDIR}/devel/libffi
 .endif
 
 BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk8
-.if ${ARCH} == "armv6"
+.if ${ARCH:Marmv6*}
 BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk
 .else
 BOOTSTRAP_JDKS+= ${LOCALBASE}/openjdk7
@@ -302,7 +302,7 @@ BOOTSTRAPJDKDIR=	${BJDK}
 
 # if no valid jdk found, set dependency
 .if !defined(BOOTSTRAPJDKDIR)
-.  if ${ARCH} == "armv6"
+.  if ${ARCH:Marmv6*}
 # bootstrap-openjdk is based on openjdk7 and can compile openjdk8
 BOOTSTRAPJDKDIR?=	${LOCALBASE}/bootstrap-openjdk
 BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/bootstrap-openjdk