diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-23 11:25:08 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-23 11:25:08 +0800 |
| commit | d1e85f5116c8f6faa80944cef3cb3aac2387536d (patch) | |
| tree | 684ffd14303e9badd199bea12d9fcc9471ed67a1 /java | |
| parent | ba7e33d91fe0ee281bd4edcb2ffe934506100aee (diff) | |
| download | freebsd-ports-gnome-d1e85f5116c8f6faa80944cef3cb3aac2387536d.tar.gz freebsd-ports-gnome-d1e85f5116c8f6faa80944cef3cb3aac2387536d.tar.zst freebsd-ports-gnome-d1e85f5116c8f6faa80944cef3cb3aac2387536d.zip | |
- Update to r351880.
- Bundle libfreetype.so.6.
Diffstat (limited to 'java')
| -rw-r--r-- | java/bootstrap-openjdk/Makefile | 4 | ||||
| -rw-r--r-- | java/bootstrap-openjdk/Makefile.update | 2 | ||||
| -rw-r--r-- | java/bootstrap-openjdk/distinfo.amd64 | 4 | ||||
| -rw-r--r-- | java/bootstrap-openjdk/distinfo.i386 | 4 | ||||
| -rw-r--r-- | java/bootstrap-openjdk/pkg-plist | 1 |
5 files changed, 9 insertions, 6 deletions
diff --git a/java/bootstrap-openjdk/Makefile b/java/bootstrap-openjdk/Makefile index 935ac7ebc94e..b7a6ee377e96 100644 --- a/java/bootstrap-openjdk/Makefile +++ b/java/bootstrap-openjdk/Makefile @@ -18,8 +18,8 @@ RUN_DEPENDS= ${LOCALBASE}/share/java/zi:${PORTSDIR}/java/java-zoneinfo ONLY_FOR_ARCH= amd64 i386 DISTINFO_FILE= ${.CURDIR}/distinfo.${ARCH} -DISTVERSION_amd64= r348097 -DISTVERSION_i386= r348097 +DISTVERSION_amd64= r351880 +DISTVERSION_i386= r351880 JDK_NAME= openjdk JDK_PORT= openjdk6 diff --git a/java/bootstrap-openjdk/Makefile.update b/java/bootstrap-openjdk/Makefile.update index 868b10119789..c3da35f51d7e 100644 --- a/java/bootstrap-openjdk/Makefile.update +++ b/java/bootstrap-openjdk/Makefile.update @@ -78,6 +78,8 @@ all: @${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 diff --git a/java/bootstrap-openjdk/distinfo.amd64 b/java/bootstrap-openjdk/distinfo.amd64 index effcf104f1cb..eb18df721033 100644 --- a/java/bootstrap-openjdk/distinfo.amd64 +++ b/java/bootstrap-openjdk/distinfo.amd64 @@ -1,2 +1,2 @@ -SHA256 (openjdk6-amd64-r348097.tar.xz) = 1b5336492a0c8c7b000e19962df992824d759b7c37cc7a82dec815af37caeed2 -SIZE (openjdk6-amd64-r348097.tar.xz) = 22308008 +SHA256 (openjdk6-amd64-r351880.tar.xz) = 1e94f633fbf627aefdacb22b0a8509f1711a7aee00b522276cd0696775481c33 +SIZE (openjdk6-amd64-r351880.tar.xz) = 22627688 diff --git a/java/bootstrap-openjdk/distinfo.i386 b/java/bootstrap-openjdk/distinfo.i386 index a62587c83a6a..3962ce2546fe 100644 --- a/java/bootstrap-openjdk/distinfo.i386 +++ b/java/bootstrap-openjdk/distinfo.i386 @@ -1,2 +1,2 @@ -SHA256 (openjdk6-i386-r348097.tar.xz) = 8262d25008e9288412ab2f975d5da039c6764d2c34117537434db07afdeb270a -SIZE (openjdk6-i386-r348097.tar.xz) = 22414808 +SHA256 (openjdk6-i386-r351880.tar.xz) = e885716265167100ee70dbf07d9c58760426b56584301699339301b888c8f226 +SIZE (openjdk6-i386-r351880.tar.xz) = 22721876 diff --git a/java/bootstrap-openjdk/pkg-plist b/java/bootstrap-openjdk/pkg-plist index b3dffa0ee0ed..16df44ae8ab2 100644 --- a/java/bootstrap-openjdk/pkg-plist +++ b/java/bootstrap-openjdk/pkg-plist @@ -28,6 +28,7 @@ %%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 |