svn commit: r306352 - head/java/bootstrap-openjdk
Jung-uk Kim
jkim at FreeBSD.org
Wed Oct 24 19:57:18 UTC 2012
Author: jkim
Date: Wed Oct 24 19:57:17 2012
New Revision: 306352
URL: http://svn.freebsd.org/changeset/ports/306352
Log:
- Update to r306294.
- Trim more files to simplify maintenance.
Feature safe: yes
Modified:
head/java/bootstrap-openjdk/Makefile
head/java/bootstrap-openjdk/Makefile.update
head/java/bootstrap-openjdk/distinfo.amd64
head/java/bootstrap-openjdk/distinfo.i386
head/java/bootstrap-openjdk/pkg-plist
Modified: head/java/bootstrap-openjdk/Makefile
==============================================================================
--- head/java/bootstrap-openjdk/Makefile Wed Oct 24 18:08:50 2012 (r306351)
+++ head/java/bootstrap-openjdk/Makefile Wed Oct 24 19:57:17 2012 (r306352)
@@ -18,8 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/java/zi:
ONLY_FOR_ARCH= amd64 i386
DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH}
-DISTVERSION_amd64= r305682
-DISTVERSION_i386= r305682
+DISTVERSION_amd64= r306294
+DISTVERSION_i386= r306294
JDK_NAME= openjdk
JDK_PORT= openjdk6
@@ -31,7 +31,6 @@ USE_XZ= yes
WRKSRC= ${WRKDIR}/${JDK_ROOT}
INSTALLDIR= ${PREFIX}/${JDK_ROOT}
-JDK_BINS= bin/* jre/bin/* jre/lib/${ARCH}/jexec
.include <bsd.port.pre.mk>
@@ -47,8 +46,8 @@ PLIST_SUB+= CLIENTVM="@comment "
do-install:
@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
- @cd ${INSTALLDIR} && ${CHOWN} ${BINOWN}:${BINGRP} ${JDK_BINS}
- @cd ${INSTALLDIR} && ${CHMOD} ${BINMODE} ${JDK_BINS}
+ @${CHOWN} ${BINOWN}:${BINGRP} ${INSTALLDIR}/bin/*
+ @${CHMOD} ${BINMODE} ${INSTALLDIR}/bin/*
@${CAT} ${PKGMESSAGE}
update:
Modified: head/java/bootstrap-openjdk/Makefile.update
==============================================================================
--- head/java/bootstrap-openjdk/Makefile.update Wed Oct 24 18:08:50 2012 (r306351)
+++ head/java/bootstrap-openjdk/Makefile.update Wed Oct 24 19:57:17 2012 (r306352)
@@ -17,14 +17,17 @@ LOCALBASE?= /usr/local
.include "${PORTSDIR}/Mk/bsd.commands.mk"
-JDK_EXCLUDE?= demo man sample src.zip
+JDK_EXCLUDE?= demo im images java-rmi.cgi jexec jre/bin man management \
+ native_threads sample src.zip
JDK_PORTDIR!= ${REALPATH} ${PORTSDIR}/java/${JDK_PORT}
JDK_IMAGEDIR?= ${JDK_PORTDIR}/work/build/bsd-${ARCH:S/i386/i586/}/j2sdk-image
GET_REVISION= ${LOCALBASE}/bin/svnversion ${JDK_PORTDIR}
TAR?= /usr/bin/tar
+.if !defined(ARCH)
ARCH!= ${UNAME} -p
+.endif
BUILD_OS!= ${UNAME} -r | ${SED} -e 's/\..*//'
PORTREVISION!= ${GET_REVISION} 2>/dev/null || ${TRUE}
@@ -58,7 +61,7 @@ all:
@${ECHO} "=============================================================="
@${ECHO} ""
.if !defined(NO_BUILD)
- @cd "${JDK_PORTDIR}" && ${MAKE} BATCH=yes
+ @${SETENV} -i PATH=${PATH} ${MAKE} -C "${JDK_PORTDIR}" BATCH=yes
.endif
@cd "${JDK_IMAGEDIR}" && \
${FIND} . \! -type d | ${SORT} | \
Modified: head/java/bootstrap-openjdk/distinfo.amd64
==============================================================================
--- head/java/bootstrap-openjdk/distinfo.amd64 Wed Oct 24 18:08:50 2012 (r306351)
+++ head/java/bootstrap-openjdk/distinfo.amd64 Wed Oct 24 19:57:17 2012 (r306352)
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-amd64-r305682.tar.xz) = 4a9300f92669608fad6a0d763003fe4a3bc5c11875a265040d99dc78b09503b4
-SIZE (openjdk6-amd64-r305682.tar.xz) = 25168044
+SHA256 (openjdk6-amd64-r306294.tar.xz) = 8896fc61ffbb95935cdb23dd743ef12905cfe4e966989b840186afafb57bc9b9
+SIZE (openjdk6-amd64-r306294.tar.xz) = 25140432
Modified: head/java/bootstrap-openjdk/distinfo.i386
==============================================================================
--- head/java/bootstrap-openjdk/distinfo.i386 Wed Oct 24 18:08:50 2012 (r306351)
+++ head/java/bootstrap-openjdk/distinfo.i386 Wed Oct 24 19:57:17 2012 (r306352)
@@ -1,2 +1,2 @@
-SHA256 (openjdk6-i386-r305682.tar.xz) = 0fa7277c89007e5ce265494a94881f80c6d87cc73ff6b42c1f46fce83b08416d
-SIZE (openjdk6-i386-r305682.tar.xz) = 25470632
+SHA256 (openjdk6-i386-r306294.tar.xz) = 591c12ea3f4dce89bd330129af5071de70042c15c83f2d395e276ba6b0700289
+SIZE (openjdk6-i386-r306294.tar.xz) = 25441692
Modified: head/java/bootstrap-openjdk/pkg-plist
==============================================================================
--- head/java/bootstrap-openjdk/pkg-plist Wed Oct 24 18:08:50 2012 (r306351)
+++ head/java/bootstrap-openjdk/pkg-plist Wed Oct 24 19:57:17 2012 (r306352)
@@ -8,7 +8,6 @@
%%JDK_ROOT%%/bin/jar
%%JDK_ROOT%%/bin/jarsigner
%%JDK_ROOT%%/bin/java
-%%CLIENTVM%%%%JDK_ROOT%%/bin/java-rmi.cgi
%%JDK_ROOT%%/bin/javac
%%JDK_ROOT%%/bin/javadoc
%%JDK_ROOT%%/bin/javah
@@ -51,21 +50,10 @@
%%JDK_ROOT%%/jre/ASSEMBLY_EXCEPTION
%%JDK_ROOT%%/jre/LICENSE
%%JDK_ROOT%%/jre/THIRD_PARTY_README
-%%JDK_ROOT%%/jre/bin/java
-%%JDK_ROOT%%/jre/bin/keytool
-%%JDK_ROOT%%/jre/bin/orbd
-%%JDK_ROOT%%/jre/bin/pack200
-%%JDK_ROOT%%/jre/bin/policytool
-%%JDK_ROOT%%/jre/bin/rmid
-%%JDK_ROOT%%/jre/bin/rmiregistry
-%%JDK_ROOT%%/jre/bin/servertool
-%%JDK_ROOT%%/jre/bin/tnameserv
-%%JDK_ROOT%%/jre/bin/unpack200
%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/Xusage.txt
%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/libjsig.so
%%CLIENTVM%%%%JDK_ROOT%%/jre/lib/%%ARCH%%/client/libjvm.so
%%JDK_ROOT%%/jre/lib/%%ARCH%%/headless/libmawt.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/jexec
%%JDK_ROOT%%/jre/lib/%%ARCH%%/jvm.cfg
%%JDK_ROOT%%/jre/lib/%%ARCH%%/libattach.so
%%JDK_ROOT%%/jre/lib/%%ARCH%%/libawt.so
@@ -97,7 +85,6 @@
%%JDK_ROOT%%/jre/lib/%%ARCH%%/libunpack.so
%%JDK_ROOT%%/jre/lib/%%ARCH%%/libverify.so
%%JDK_ROOT%%/jre/lib/%%ARCH%%/libzip.so
-%%JDK_ROOT%%/jre/lib/%%ARCH%%/native_threads/libhpi.so
%%JDK_ROOT%%/jre/lib/%%ARCH%%/server/Xusage.txt
%%JDK_ROOT%%/jre/lib/%%ARCH%%/server/libjsig.so
%%JDK_ROOT%%/jre/lib/%%ARCH%%/server/libjvm.so
@@ -120,25 +107,11 @@
%%JDK_ROOT%%/jre/lib/flavormap.properties
%%JDK_ROOT%%/jre/lib/fontconfig.bfc
%%JDK_ROOT%%/jre/lib/fontconfig.properties.src
-%%JDK_ROOT%%/jre/lib/im/indicim.jar
-%%JDK_ROOT%%/jre/lib/im/thaiim.jar
-%%JDK_ROOT%%/jre/lib/images/cursors/cursors.properties
-%%JDK_ROOT%%/jre/lib/images/cursors/invalid32x32.gif
-%%JDK_ROOT%%/jre/lib/images/cursors/motif_CopyDrop32x32.gif
-%%JDK_ROOT%%/jre/lib/images/cursors/motif_CopyNoDrop32x32.gif
-%%JDK_ROOT%%/jre/lib/images/cursors/motif_LinkDrop32x32.gif
-%%JDK_ROOT%%/jre/lib/images/cursors/motif_LinkNoDrop32x32.gif
-%%JDK_ROOT%%/jre/lib/images/cursors/motif_MoveDrop32x32.gif
-%%JDK_ROOT%%/jre/lib/images/cursors/motif_MoveNoDrop32x32.gif
%%JDK_ROOT%%/jre/lib/jce.jar
%%JDK_ROOT%%/jre/lib/jsse.jar
%%JDK_ROOT%%/jre/lib/jvm.hprof.txt
%%JDK_ROOT%%/jre/lib/logging.properties
%%JDK_ROOT%%/jre/lib/management-agent.jar
-%%JDK_ROOT%%/jre/lib/management/jmxremote.access
-%%JDK_ROOT%%/jre/lib/management/jmxremote.password.template
-%%JDK_ROOT%%/jre/lib/management/management.properties
-%%JDK_ROOT%%/jre/lib/management/snmp.acl.template
%%JDK_ROOT%%/jre/lib/meta-index
%%JDK_ROOT%%/jre/lib/net.properties
%%JDK_ROOT%%/jre/lib/psfont.properties.ja
@@ -161,20 +134,14 @@
%%JDK_ROOT%%/lib/tools.jar
@dirrm %%JDK_ROOT%%/lib
@dirrm %%JDK_ROOT%%/jre/lib/security
- at dirrm %%JDK_ROOT%%/jre/lib/management
- at dirrm %%JDK_ROOT%%/jre/lib/images/cursors
- at dirrm %%JDK_ROOT%%/jre/lib/images
- at dirrm %%JDK_ROOT%%/jre/lib/im
@dirrm %%JDK_ROOT%%/jre/lib/ext
@dirrm %%JDK_ROOT%%/jre/lib/cmm
@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/xawt
@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/server
- at dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/native_threads
@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/headless
%%CLIENTVM%%@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%/client
@dirrm %%JDK_ROOT%%/jre/lib/%%ARCH%%
@dirrm %%JDK_ROOT%%/jre/lib
- at dirrm %%JDK_ROOT%%/jre/bin
@dirrm %%JDK_ROOT%%/jre
@dirrm %%JDK_ROOT%%/include/freebsd
@dirrm %%JDK_ROOT%%/include
More information about the svn-ports-head
mailing list