svn commit: r450710 - in head/java: . bootstrap-openjdk6
Jung-uk Kim
jkim at FreeBSD.org
Wed Sep 27 05:02:18 UTC 2017
Author: jkim
Date: Wed Sep 27 05:02:16 2017
New Revision: 450710
URL: https://svnweb.freebsd.org/changeset/ports/450710
Log:
Add bootstrap JDK for OpenJDK6.
java/bootstrap-openjdk will be used for OpenJDK7 and OpenJDK8 later.
Added:
head/java/bootstrap-openjdk6/
- copied from r450641, head/java/bootstrap-openjdk/
Deleted:
head/java/bootstrap-openjdk6/distinfo.arm
head/java/bootstrap-openjdk6/distinfo.powerpc64
Modified:
head/java/Makefile
head/java/bootstrap-openjdk6/Makefile
head/java/bootstrap-openjdk6/Makefile.update
head/java/bootstrap-openjdk6/distinfo.amd64
head/java/bootstrap-openjdk6/distinfo.i386
head/java/bootstrap-openjdk6/pkg-plist
Modified: head/java/Makefile
==============================================================================
--- head/java/Makefile Wed Sep 27 04:22:13 2017 (r450709)
+++ head/java/Makefile Wed Sep 27 05:02:16 2017 (r450710)
@@ -8,6 +8,7 @@
SUBDIR += berkeley-db
SUBDIR += bluej
SUBDIR += bootstrap-openjdk
+ SUBDIR += bootstrap-openjdk6
SUBDIR += bouncycastle
SUBDIR += bouncycastle15
SUBDIR += cacao
Modified: head/java/bootstrap-openjdk6/Makefile
==============================================================================
--- head/java/bootstrap-openjdk/Makefile Tue Sep 26 01:35:56 2017 (r450641)
+++ head/java/bootstrap-openjdk6/Makefile Wed Sep 27 05:02:16 2017 (r450710)
@@ -1,77 +1,48 @@
# $FreeBSD$
-PORTNAME= ${JDK_NAME}
-PORTVERSION= ${DISTVERSION_${JDK_ARCH}}
-PORTREVISION= 1
+PORTNAME= openjdk6
+PORTVERSION= ${DISTVERSION_${ARCH}}
CATEGORIES= java devel
-MASTER_SITES= ${JDK_MASTER_SITES}
+MASTER_SITES= LOCAL/jkim
PKGNAMEPREFIX= bootstrap-
-DISTNAME= ${JDK_PORT}-${JDK_ARCH}-${PORTVERSION}
+DISTNAME= ${PORTNAME}-${ARCH}-${PORTVERSION}
MAINTAINER= jkim at FreeBSD.org
COMMENT= Oracle\'s Java 6 virtual machine release under the GPL v2
LICENSE= GPLv2
+ONLY_FOR_ARCHS= amd64 i386
+
RUN_DEPENDS= java-zoneinfo>0:java/java-zoneinfo
-BUNDLE_LIBS= yes
+DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH}
+DISTVERSION_amd64= r450701
+DISTVERSION_i386= r450701
-ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc64
-BROKEN_powerpc64= fails to build: pkg-static: Unable to access file jre/lib/powerpc64/jvm.cfg
+JDK_ROOT= bootstrap-${PORTNAME}
-DISTINFO_FILE= ${.CURDIR}/distinfo.${JDK_ARCH}
-DISTVERSION_amd64= r351880
-DISTVERSION_arm= r378760
-DISTVERSION_i386= r351880
-DISTVERSION_powerpc64= r407937
-
-JDK_ARCH= ${ARCH:C/armv6.*/arm/}
-JDK_NAME= openjdk
-JDK_ROOT= bootstrap-${JDK_NAME}
-
NO_BUILD= yes
-PLIST_SUB= JDK_ARCH=${JDK_ARCH} JDK_NAME=${JDK_NAME} JDK_ROOT=${JDK_ROOT}
+PLIST_SUB= ARCH=${ARCH} JDK_ROOT=${JDK_ROOT}
USES= tar:xz
WRKSRC= ${WRKDIR}/${JDK_ROOT}
INSTALLDIR= ${STAGEDIR}${PREFIX}/${JDK_ROOT}
-.if !exists(/usr/lib/libstdc++.so.6)
-PLIST_SUB+= LIBSTDCXX=""
-.else
-EXCLUDE_EXP= -not -name libstdc++.so.6
-PLIST_SUB+= LIBSTDCXX="@comment "
-.endif
-
.include <bsd.port.pre.mk>
-JDK_MASTER_SITES= LOCAL/jkim
-
-.if ${ARCH:Marmv6*}
-JDK_PORT= openjdk7
-.else
-JDK_PORT= openjdk6
-.endif
-
.if ${ARCH} == "i386"
PLIST_SUB+= CLIENTVM=""
.else
PLIST_SUB+= CLIENTVM="@comment "
.endif
-.if ${ARCH} == "powerpc64"
-JDK_PORT= openjdk7
-JDK_NAME= openjdk
-JDK_MASTER_SITES= LOCAL/glewis/bootstrap-openjdk
-.endif
-
do-install:
- @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} "${EXCLUDE_EXP}"
+ @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
@cd ${WRKSRC} && ${COPYTREE_BIN} "bin jre/bin" ${INSTALLDIR}
update:
@${MAKE} -f ${.CURDIR}/Makefile.update \
- JDK_NAME=${JDK_NAME} JDK_PORT=${JDK_PORT} JDK_ROOT=${JDK_ROOT}
+ JDK_PORT=${PORTNAME} JDK_ROOT=${JDK_ROOT}
.include <bsd.port.post.mk>
Modified: head/java/bootstrap-openjdk6/Makefile.update
==============================================================================
--- head/java/bootstrap-openjdk/Makefile.update Tue Sep 26 01:35:56 2017 (r450641)
+++ head/java/bootstrap-openjdk6/Makefile.update Wed Sep 27 05:02:16 2017 (r450710)
@@ -1,9 +1,8 @@
# $FreeBSD$
-JDK_NAME?= openjdk
JDK_PORT?= openjdk6
-JDK_ROOT?= bootstrap-${JDK_NAME}
-TARGET_OS?= 8
+JDK_ROOT?= bootstrap-${JDK_PORT}
+TARGET_OS?= 10
.if !defined(PORTSDIR)
.if exists(${.CURDIR}/../${JDK_PORT}/Makefile)
@@ -17,8 +16,6 @@ LOCALBASE?= /usr/local
.include "${PORTSDIR}/Mk/bsd.commands.mk"
-FT2_PORTDIR!= ${REALPATH} ${PORTSDIR}/print/freetype2
-FT2_IMAGEDIR?= ${FT2_PORTDIR}/work/stage/usr/local
JDK_PORTDIR!= ${REALPATH} ${PORTSDIR}/java/${JDK_PORT}
JDK_IMAGEDIR?= ${JDK_PORTDIR}/work/stage/usr/local/${JDK_PORT}
@@ -40,20 +37,14 @@ PLIST_SUB= ARCH="${ARCH}" JDK_ROOT="."
BUILD_ARGS= BATCH=yes PORT_DBDIR=/var/empty
BUILD_ENV= __MAKE_CONF=/dev/null PATH="${PATH}"
-FT2_BUILD_ARGS= ${BUILD_ARGS}
-FT2_BUILD_ARGS+=CONFIGURE_ARGS="--without-bzip2 --without-png --without-zlib"
JDK_BUILD_ARGS= ${BUILD_ARGS}
JDK_BUILD_ARGS+=java_openjdk6_UNSET=ICEDTEA
-JDK_BUILD_ARGS+=ALT_FREETYPE_HEADERS_PATH="${FT2_IMAGEDIR}/include"
-JDK_BUILD_ARGS+=ALT_FREETYPE_LIB_PATH="${FT2_IMAGEDIR}/lib"
-JDK_BUILD_ARGS+=SYSTEM_ZLIB=false ZLIB_LDFLAGS=""
.if ${ARCH} == "i386"
PLIST_SUB+= CLIENTVM=""
.else
PLIST_SUB+= CLIENTVM="@comment "
.endif
-PLIST_SUB+= LIBSTDCXX=""
all:
@${ECHO} ""
@@ -74,12 +65,7 @@ all:
@${ECHO} ""
.if !defined(NO_BUILD)
@${SETENV} -i ${BUILD_ENV} \
- ${MAKE} -C "${FT2_PORTDIR}" ${FT2_BUILD_ARGS} stage
- @${SETENV} -i ${BUILD_ENV} \
${MAKE} -C "${JDK_PORTDIR}" ${JDK_BUILD_ARGS} stage
- @${CP} -p /usr/lib/libstdc++.so.6 "${JDK_IMAGEDIR}/jre/lib/${ARCH}"
- @${CP} -p "${FT2_IMAGEDIR}/lib/libfreetype.so.6" \
- "${JDK_IMAGEDIR}/jre/lib/${ARCH}"
@${FIND} "${JDK_IMAGEDIR}" -type f \
-exec ${STRIP_CMD} -s {} \; 2> /dev/null
.endif
@@ -100,7 +86,7 @@ all:
@${ECHO} "Finished at "`date -u`"."
@${ECHO} ""
@${ECHO} "You may clean up the build directory if everything looks okay,"
- @${ECHO} "e.g., 'rm -fr ${FT2_PORTDIR}/work ${JDK_PORTDIR}/work'."
+ @${ECHO} "e.g., 'rm -fr ${JDK_PORTDIR}/work'."
@${ECHO} ""
@${ECHO} "=============================================================="
@${ECHO} ""
Modified: head/java/bootstrap-openjdk6/distinfo.amd64
==============================================================================
--- head/java/bootstrap-openjdk/distinfo.amd64 Tue Sep 26 01:35:56 2017 (r450641)
+++ head/java/bootstrap-openjdk6/distinfo.amd64 Wed Sep 27 05:02:16 2017 (r450710)
@@ -1,2 +1,3 @@
-SHA256 (openjdk6-amd64-r351880.tar.xz) = 1e94f633fbf627aefdacb22b0a8509f1711a7aee00b522276cd0696775481c33
-SIZE (openjdk6-amd64-r351880.tar.xz) = 22627688
+TIMESTAMP = 1506476350
+SHA256 (openjdk6-amd64-r450701.tar.xz) = efeae4b3d09d92d06182fe79b9a0348fddf4229909db33cbb0aef6d25a2fabf0
+SIZE (openjdk6-amd64-r450701.tar.xz) = 22084332
Modified: head/java/bootstrap-openjdk6/distinfo.i386
==============================================================================
--- head/java/bootstrap-openjdk/distinfo.i386 Tue Sep 26 01:35:56 2017 (r450641)
+++ head/java/bootstrap-openjdk6/distinfo.i386 Wed Sep 27 05:02:16 2017 (r450710)
@@ -1,2 +1,3 @@
-SHA256 (openjdk6-i386-r351880.tar.xz) = e885716265167100ee70dbf07d9c58760426b56584301699339301b888c8f226
-SIZE (openjdk6-i386-r351880.tar.xz) = 22721876
+TIMESTAMP = 1506476351
+SHA256 (openjdk6-i386-r450701.tar.xz) = ec38b1473e1a7c4118080043cc6458771f3ac8a9b56dc344e10badd6e4abeece
+SIZE (openjdk6-i386-r450701.tar.xz) = 22155724
Modified: head/java/bootstrap-openjdk6/pkg-plist
==============================================================================
--- head/java/bootstrap-openjdk/pkg-plist Tue Sep 26 01:35:56 2017 (r450641)
+++ head/java/bootstrap-openjdk6/pkg-plist Wed Sep 27 05:02:16 2017 (r450710)
@@ -25,22 +25,20 @@
%%JDK_ROOT%%/jre/lib/net.properties
%%JDK_ROOT%%/jre/lib/resources.jar
%%JDK_ROOT%%/jre/lib/rt.jar
-%%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/%%ARCH%%/jvm.cfg
+%%JDK_ROOT%%/jre/lib/%%ARCH%%/libawt.so
+%%JDK_ROOT%%/jre/lib/%%ARCH%%/libfontmanager.so
+%%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
+%%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/cmm/GRAY.pf
%%JDK_ROOT%%/jre/lib/cmm/PYCC.pf
%%JDK_ROOT%%/jre/lib/cmm/sRGB.pf
More information about the svn-ports-all
mailing list