sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to b32.

Browse source 
- Update TimeZoneNames to tzdata2014b.
- Enlist openjdk6 users as testers of ant 1.9.4.
This commit is contained in:
Jung-uk Kim 2014-07-17 04:03:21 +00:00
parent 16c215ee4d
commit e45d1e1be9
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=362118
5 changed files with 310 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
java/openjdk6-jre/Makefile
View file

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
PORTREVISION= 3 PORTREVISION= 0
CATEGORIES= java devel CATEGORIES= java devel
PKGNAMESUFFIX= -jre PKGNAMESUFFIX= -jre

8
java/openjdk6/Makefile
View file

@ -2,8 +2,8 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= openjdk6 PORTNAME= openjdk6
PORTVERSION= b31 PORTVERSION= b32
PORTREVISION?= 4 PORTREVISION?= 0
PORTEPOCH= 1 PORTEPOCH= 1
CATEGORIES= java devel CATEGORIES= java devel
MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \ MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \
@ -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_apr_2014 OPENJDK_BUILDDATE= 15_jul_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
@ -67,7 +67,7 @@ USE_XORG= x11 xext xi xt xtst
# do not depend on devel/apache-ant to avoid circular dependency, but # do not depend on devel/apache-ant to avoid circular dependency, but
# use .tar.bz2 distfile to avoid duplicated downloads # use .tar.bz2 distfile to avoid duplicated downloads
ANTVERSION= 1.9.3 ANTVERSION= 1.9.4
ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2 ANTFILE= apache-ant-${ANTVERSION}-bin.tar.bz2
JTREG_BUILD= b05_29_nov_2012 JTREG_BUILD= b05_29_nov_2012

8
java/openjdk6/distinfo
View file

@ -1,6 +1,6 @@
SHA256 (apache-ant-1.9.3-bin.tar.bz2) = ca14a31b2b47edd069624520f64957ad502c0905421da5f46dd41229b8ba4cbf SHA256 (apache-ant-1.9.4-bin.tar.bz2) = 20c16575684b8869dd9d19abe0fb504566adefb5d397881e70a417886e0088cf
SIZE (apache-ant-1.9.3-bin.tar.bz2) = 4320310 SIZE (apache-ant-1.9.4-bin.tar.bz2) = 4351965
SHA256 (openjdk-6-src-b31-15_apr_2014.tar.xz) = 362d9bf20e91393b52dd0513896d39831cf320c49bd4bf1e28124f21569b72eb SHA256 (openjdk-6-src-b32-15_jul_2014.tar.xz) = 9a5ad1b599953baac1b6b34189b9487ac5dcdb367aac5cc0aa5aa49700e73871
SIZE (openjdk-6-src-b31-15_apr_2014.tar.xz) = 33245892 SIZE (openjdk-6-src-b32-15_jul_2014.tar.xz) = 33267124
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

422
java/openjdk6/files/patch-TimeZoneNames
View file

File diff suppressed because it is too large Load diff

11
java/openjdk6/files/patch-set
View file

@ -8274,17 +8274,6 @@
#include <math.h> #include <math.h>
#include <jlong.h> #include <jlong.h>
--- jdk/src/share/native/sun/management/GcInfoBuilder.c
+++ jdk/src/share/native/sun/management/GcInfoBuilder.c
@@ -190,7 +190,7 @@
if (ext_att_count <= 0) {
JNU_ThrowIllegalArgumentException(env, "Invalid ext_att_count");
- return;
+ return 0;
}
gc_stat.usage_before_gc = usageBeforeGC;
--- jdk/src/share/transport/socket/socketTransport.c --- jdk/src/share/transport/socket/socketTransport.c
+++ jdk/src/share/transport/socket/socketTransport.c +++ jdk/src/share/transport/socket/socketTransport.c
@@ -65,6 +65,9 @@ @@ -65,6 +65,9 @@