[Midnightbsd-cvs] mports [16885] trunk/java/bootstrap-openjdk: update bootstrap jdk

[laffer1 at midnightbsd.org]

Revision: 16885
          http://svnweb.midnightbsd.org/mports/?rev=16885
Author:   laffer1
Date:     2014-09-07 00:45:03 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
update bootstrap jdk

Modified Paths:
--------------
    trunk/java/bootstrap-openjdk/Makefile
    trunk/java/bootstrap-openjdk/distinfo
    trunk/java/bootstrap-openjdk/pkg-plist

Modified: trunk/java/bootstrap-openjdk/Makefile
===================================================================
--- trunk/java/bootstrap-openjdk/Makefile	2014-09-07 04:41:19 UTC (rev 16884)
+++ trunk/java/bootstrap-openjdk/Makefile	2014-09-07 04:45:03 UTC (rev 16885)
@@ -18,8 +18,8 @@
 ONLY_FOR_ARCH=	amd64 i386
 
 DISTINFO_FILE=	${.CURDIR}/distinfo.${ARCH}
-DISTVERSION_amd64=	r333271
-DISTVERSION_i386=	r333271
+DISTVERSION_amd64=	r351880
+DISTVERSION_i386=	r351880
 
 JDK_NAME=	openjdk
 JDK_PORT=	openjdk6
@@ -32,12 +32,15 @@
 
 INSTALLDIR=	${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>
 
-.if ${OSVERSION} >= 4015
-RUN_DEPENDS+=	${LOCALBASE}/lib/compat/libz.so.5:${PORTSDIR}/misc/compat8x
-.endif
-
 .if ${ARCH} == "i386"
 PLIST_SUB+=	CLIENTVM=""
 .else
@@ -45,9 +48,8 @@
 .endif
 
 do-install:
-	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
-	@${CHOWN} ${BINOWN}:${BINGRP} ${INSTALLDIR}/bin/* ${INSTALLDIR}/jre/bin/*
-	@${CHMOD} ${BINMODE} ${INSTALLDIR}/bin/* ${INSTALLDIR}/jre/bin/*
+	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR} "${EXCLUDE_EXP}"
+	@cd ${WRKSRC} && ${COPYTREE_BIN} "bin jre/bin" ${INSTALLDIR}
 	(cd ${INSTALLDIR}/include && ln -s freebsd midnightbsd)
 
 update:

Modified: trunk/java/bootstrap-openjdk/distinfo
===================================================================
--- trunk/java/bootstrap-openjdk/distinfo	2014-09-07 04:41:19 UTC (rev 16884)
+++ trunk/java/bootstrap-openjdk/distinfo	2014-09-07 04:45:03 UTC (rev 16885)
@@ -1,4 +1,4 @@
-SHA256 (openjdk6-i386-r333271.tar.xz) = 1583de7df6b9f0003222b7d48176150a6ce0bb63cb1bda476a1f998e65020a3b
-SIZE (openjdk6-i386-r333271.tar.xz) = 22054372
-SHA256 (openjdk6-amd64-r333271.tar.xz) = a37ad2c34c621bccf8762eb9447945741baa67b1fc085ca3d85e110b2780fe8d
-SIZE (openjdk6-amd64-r333271.tar.xz) = 21935920
+SHA256 (openjdk6-amd64-r351880.tar.xz) = 1e94f633fbf627aefdacb22b0a8509f1711a7aee00b522276cd0696775481c33
+SIZE (openjdk6-amd64-r351880.tar.xz) = 22627688
+SHA256 (openjdk6-i386-r351880.tar.xz) = e885716265167100ee70dbf07d9c58760426b56584301699339301b888c8f226
+SIZE (openjdk6-i386-r351880.tar.xz) = 22721876

Modified: trunk/java/bootstrap-openjdk/pkg-plist
===================================================================
--- trunk/java/bootstrap-openjdk/pkg-plist	2014-09-07 04:41:19 UTC (rev 16884)
+++ trunk/java/bootstrap-openjdk/pkg-plist	2014-09-07 04:45:03 UTC (rev 16885)
@@ -28,11 +28,13 @@
 %%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