From owner-svn-ports-head@freebsd.org Thu Oct 15 18:01:55 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8081DA155B3; Thu, 15 Oct 2015 18:01:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 562B5E28; Thu, 15 Oct 2015 18:01:55 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9FI1svq083483; Thu, 15 Oct 2015 18:01:54 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9FI1sRR083479; Thu, 15 Oct 2015 18:01:54 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201510151801.t9FI1sRR083479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 15 Oct 2015 18:01:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399355 - in head/java: bootstrap-openjdk openjdk8 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Oct 2015 18:01:55 -0000 Author: jkim Date: Thu Oct 15 18:01:53 2015 New Revision: 399355 URL: https://svnweb.freebsd.org/changeset/ports/399355 Log: Add support for armv6hf. Tested on Raspberry Pi 2 Model B. Added: head/java/bootstrap-openjdk/distinfo.arm - copied, changed from r399324, head/java/bootstrap-openjdk/distinfo.armv6 Deleted: head/java/bootstrap-openjdk/distinfo.armv6 Modified: head/java/bootstrap-openjdk/Makefile head/java/bootstrap-openjdk/pkg-plist head/java/openjdk8/Makefile Modified: head/java/bootstrap-openjdk/Makefile ============================================================================== --- head/java/bootstrap-openjdk/Makefile Thu Oct 15 15:36:50 2015 (r399354) +++ head/java/bootstrap-openjdk/Makefile Thu Oct 15 18:01:53 2015 (r399355) @@ -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 -.if ${ARCH} == "armv6" +.if ${ARCH:Marmv6*} JDK_PORT= openjdk7 +.else +JDK_PORT= openjdk6 .endif .if ${ARCH} == "i386" Copied and modified: head/java/bootstrap-openjdk/distinfo.arm (from r399324, head/java/bootstrap-openjdk/distinfo.armv6) ============================================================================== --- head/java/bootstrap-openjdk/distinfo.armv6 Thu Oct 15 00:15:24 2015 (r399324, copy source) +++ head/java/bootstrap-openjdk/distinfo.arm Thu Oct 15 18:01:53 2015 (r399355) @@ -1,2 +1,2 @@ -SHA256 (openjdk7-armv6-r378760.tar.xz) = 4b4ca5f1ae2d4bd32a969fef4163f165538309672ede83e33116fccfea181c8e -SIZE (openjdk7-armv6-r378760.tar.xz) = 25109864 +SHA256 (openjdk7-arm-r378760.tar.xz) = 4b4ca5f1ae2d4bd32a969fef4163f165538309672ede83e33116fccfea181c8e +SIZE (openjdk7-arm-r378760.tar.xz) = 25109864 Modified: head/java/bootstrap-openjdk/pkg-plist ============================================================================== --- head/java/bootstrap-openjdk/pkg-plist Thu Oct 15 15:36:50 2015 (r399354) +++ head/java/bootstrap-openjdk/pkg-plist Thu Oct 15 18:01:53 2015 (r399355) @@ -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 Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Thu Oct 15 15:36:50 2015 (r399354) +++ head/java/openjdk8/Makefile Thu Oct 15 18:01:53 2015 (r399355) @@ -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/j2s .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}/deve .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