mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Update to b33.

Browse Source 
- Update TimeZoneNames to tzdata2014g.
This commit is contained in:
Jung-uk Kim 2014-10-17 05:00:20 +00:00
parent 9ce603baaf
commit 1c8be2bab1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=371027
4 changed files with 1485 additions and 715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/openjdk6/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= openjdk6 PORTNAME= openjdk6
PORTVERSION= b32 PORTVERSION= b33
PORTREVISION?= 0 PORTREVISION?= 0
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= java devel CATEGORIES= java devel
@ -30,7 +30,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
OPENJDK_BUILDDATE= 15_jul_2014 OPENJDK_BUILDDATE= 14_oct_2014
OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE
OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE
@ -326,11 +326,7 @@ do-install:
${SED} -e 's,^\./,openjdk6-jre/,' >> ${TMPPLIST} ${SED} -e 's,^\./,openjdk6-jre/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \ @cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
${FIND} -s . -type d -empty | \ ${FIND} -s . -type d -empty | \
${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6-jre/,' >> ${TMPPLIST} ${SED} 's,^\./,@dir openjdk6-jre/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6-jre && \
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
${SED} 's,^\.,@dirrm openjdk6-jre/,' >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm openjdk6-jre" >> ${TMPPLIST}
@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL} @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-jre/bin/java' >> ${PKGDEINSTALL}
@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL} @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-jre/bin/java # OpenJDK6 JRE"' >> ${PKGINSTALL}
.else .else
@ -339,11 +335,7 @@ do-install:
${SED} -e 's,^\./,openjdk6/,' >> ${TMPPLIST} ${SED} -e 's,^\./,openjdk6/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \ @cd ${STAGEDIR}${PREFIX}/openjdk6 && \
${FIND} -s . -type d -empty | \ ${FIND} -s . -type d -empty | \
${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6/,' >> ${TMPPLIST} ${SED} 's,^\./,@dir openjdk6/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6 && \
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
${SED} 's,^\./,@dirrm openjdk6/,' >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm openjdk6" >> ${TMPPLIST}
@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL} @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6/bin/java' >> ${PKGDEINSTALL}
@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL} @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6/bin/java # OpenJDK6"' >> ${PKGINSTALL}
.if ${PORT_OPTIONS:MFASTDEBUG} .if ${PORT_OPTIONS:MFASTDEBUG}
@ -352,11 +344,7 @@ do-install:
${SED} -e 's,^\./,openjdk6-fastdebug/,' >> ${TMPPLIST} ${SED} -e 's,^\./,openjdk6-fastdebug/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \ @cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
${FIND} -s . -type d -empty | \ ${FIND} -s . -type d -empty | \
${SED} 's,^\./,@exec ${MKDIR} %D/openjdk6-fastdebug/,' >> ${TMPPLIST} ${SED} 's,^\./,@dir openjdk6-fastdebug/,' >> ${TMPPLIST}
@cd ${STAGEDIR}${PREFIX}/openjdk6-fastdebug && \
${FIND} . -type d -not -depth 0 | ${SORT} -r | \
${SED} 's,^\./,@dirrm openjdk6-fastdebug/,' >> ${TMPPLIST}
@${ECHO_CMD} "@dirrm openjdk6-fastdebug" >> ${TMPPLIST}
@${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL} @${ECHO_CMD} '${TEST} $$2 = DEINSTALL && ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk6-fastdebug/bin/java' >> ${PKGDEINSTALL}
@${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL} @${ECHO_CMD} '${TEST} $$2 = POST-INSTALL && ${LOCALBASE}/bin/registervm "${PREFIX}/openjdk6-fastdebug/bin/java # OpenJDK6"' >> ${PKGINSTALL}
.endif .endif

4
java/openjdk6/distinfo
View File

@ -1,6 +1,6 @@
SHA256 (apache-ant-1.9.4-bin.tar.bz2) = 20c16575684b8869dd9d19abe0fb504566adefb5d397881e70a417886e0088cf SHA256 (apache-ant-1.9.4-bin.tar.bz2) = 20c16575684b8869dd9d19abe0fb504566adefb5d397881e70a417886e0088cf
SIZE (apache-ant-1.9.4-bin.tar.bz2) = 4351965 SIZE (apache-ant-1.9.4-bin.tar.bz2) = 4351965
SHA256 (openjdk-6-src-b32-15_jul_2014.tar.xz) = 9a5ad1b599953baac1b6b34189b9487ac5dcdb367aac5cc0aa5aa49700e73871 SHA256 (openjdk-6-src-b33-14_oct_2014.tar.xz) = cabc35587a90fa81edd8ba8537c0454348c37456de27e407bbb66d52031a1293
SIZE (openjdk-6-src-b32-15_jul_2014.tar.xz) = 33267124 SIZE (openjdk-6-src-b33-14_oct_2014.tar.xz) = 33476800
SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d
SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382 SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382

2144
java/openjdk6/files/patch-TimeZoneNames
View File

File diff suppressed because it is too large Load Diff

30
java/openjdk6/files/patch-set
View File

@ -682,10 +682,19 @@
-# -#
- -
-# -#
# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
@@ -221,6 +217,7 @@ @@ -88,7 +84,7 @@
JVM_EnableCompiler;
JVM_Exit;
JVM_FillInStackTrace;
- JVM_FindClassFromCaller
+ JVM_FindClassFromCaller;
JVM_FindClassFromClass;
JVM_FindClassFromClassLoader;
JVM_FindClassFromBootLoader;
@@ -222,6 +218,7 @@
JVM_SetArrayElement; JVM_SetArrayElement;
JVM_SetClassSigners; JVM_SetClassSigners;
JVM_SetLength; JVM_SetLength;
@ -693,7 +702,7 @@
JVM_SetPrimitiveArrayElement; JVM_SetPrimitiveArrayElement;
JVM_SetProtectionDomain; JVM_SetProtectionDomain;
JVM_SetSockOpt; JVM_SetSockOpt;
@@ -244,24 +241,6 @@ @@ -245,24 +242,6 @@
JVM_Yield; JVM_Yield;
JVM_handle_bsd_signal; JVM_handle_bsd_signal;
@ -726,10 +735,19 @@
-# -#
- -
-# -#
# Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
@@ -221,6 +217,7 @@ @@ -88,7 +84,7 @@
JVM_EnableCompiler;
JVM_Exit;
JVM_FillInStackTrace;
- JVM_FindClassFromCaller
+ JVM_FindClassFromCaller;
JVM_FindClassFromClass;
JVM_FindClassFromClassLoader;
JVM_FindClassFromBootLoader;
@@ -222,6 +218,7 @@
JVM_SetArrayElement; JVM_SetArrayElement;
JVM_SetClassSigners; JVM_SetClassSigners;
JVM_SetLength; JVM_SetLength;
@ -737,7 +755,7 @@
JVM_SetPrimitiveArrayElement; JVM_SetPrimitiveArrayElement;
JVM_SetProtectionDomain; JVM_SetProtectionDomain;
JVM_SetSockOpt; JVM_SetSockOpt;
@@ -244,24 +241,6 @@ @@ -245,24 +242,6 @@
JVM_Yield; JVM_Yield;
JVM_handle_bsd_signal; JVM_handle_bsd_signal;