From owner-svn-ports-head@FreeBSD.ORG Wed Apr 16 01:43:55 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 29356680; Wed, 16 Apr 2014 01:43:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 151D61839; Wed, 16 Apr 2014 01:43:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3G1hsUL047798; Wed, 16 Apr 2014 01:43:54 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3G1hsOH047792; Wed, 16 Apr 2014 01:43:54 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201404160143.s3G1hsOH047792@svn.freebsd.org> From: Jung-uk Kim Date: Wed, 16 Apr 2014 01:43:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351372 - in head/java: openjdk6 openjdk6-jre openjdk6/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Apr 2014 01:43:55 -0000 Author: jkim Date: Wed Apr 16 01:43:53 2014 New Revision: 351372 URL: http://svnweb.freebsd.org/changeset/ports/351372 QAT: https://qat.redports.org/buildarchive/r351372/ Log: Update to b31. Modified: head/java/openjdk6-jre/Makefile head/java/openjdk6/Makefile head/java/openjdk6/distinfo head/java/openjdk6/files/patch-set Modified: head/java/openjdk6-jre/Makefile ============================================================================== --- head/java/openjdk6-jre/Makefile Tue Apr 15 22:42:21 2014 (r351371) +++ head/java/openjdk6-jre/Makefile Wed Apr 16 01:43:53 2014 (r351372) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 CATEGORIES= java devel PKGNAMESUFFIX= -jre Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Tue Apr 15 22:42:21 2014 (r351371) +++ head/java/openjdk6/Makefile Wed Apr 16 01:43:53 2014 (r351372) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= openjdk6 -PORTVERSION= b30 -PORTREVISION?= 3 +PORTVERSION= b31 +PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \ @@ -30,7 +30,7 @@ LIB_DEPENDS= libfreetype.so:${PORTSDIR}/ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu -OPENJDK_BUILDDATE= 21_jan_2014 +OPENJDK_BUILDDATE= 15_apr_2014 OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA IPV6 TZUPDATE Modified: head/java/openjdk6/distinfo ============================================================================== --- head/java/openjdk6/distinfo Tue Apr 15 22:42:21 2014 (r351371) +++ head/java/openjdk6/distinfo Wed Apr 16 01:43:53 2014 (r351372) @@ -1,6 +1,6 @@ SHA256 (apache-ant-1.9.3-bin.tar.bz2) = ca14a31b2b47edd069624520f64957ad502c0905421da5f46dd41229b8ba4cbf SIZE (apache-ant-1.9.3-bin.tar.bz2) = 4320310 -SHA256 (openjdk-6-src-b30-21_jan_2014.tar.xz) = ebd9fdf39c8590cd620cb78c481ca233f5919f2819237b5d2b440666f1dd3475 -SIZE (openjdk-6-src-b30-21_jan_2014.tar.xz) = 33106516 +SHA256 (openjdk-6-src-b31-15_apr_2014.tar.xz) = 362d9bf20e91393b52dd0513896d39831cf320c49bd4bf1e28124f21569b72eb +SIZE (openjdk-6-src-b31-15_apr_2014.tar.xz) = 33245892 SHA256 (jtreg-4.1-bin-b05_29_nov_2012.zip) = 9291eb4a14501232b35614e88686ff66ad8b69d0098dbd4322b28f97b672653d SIZE (jtreg-4.1-bin-b05_29_nov_2012.zip) = 5993382 Modified: head/java/openjdk6/files/patch-set ============================================================================== --- head/java/openjdk6/files/patch-set Tue Apr 15 22:42:21 2014 (r351371) +++ head/java/openjdk6/files/patch-set Wed Apr 16 01:43:53 2014 (r351372) @@ -4330,7 +4330,7 @@ $(PORTFILES_export) +ifeq ($(PLATFORM), bsd) -+LDFLAGS += -L$(PACKAGE_PATH)/lib -lasound ++OTHER_LDLIBS += -L$(PACKAGE_PATH)/lib -lasound + +CPPFLAGS += \ + -DUSE_DAUDIO=TRUE \ @@ -4338,7 +4338,7 @@ + -I$(PACKAGE_PATH)/include \ + -I$(SHARE_SRC)/native/com/sun/media/sound +else - LDFLAGS += -lasound + OTHER_LDLIBS += -lasound CPPFLAGS += \ @@ -73,6 +82,7 @@ @@ -5601,17 +5601,6 @@ /* There can't be more than 64K labels because of the limit * on per-method byte code length. */ ---- jdk/src/share/native/common/jdk_util.c -+++ jdk/src/share/native/common/jdk_util.c -@@ -76,7 +76,7 @@ - } - - -- memset(info, 0, sizeof(info_size)); -+ memset(info, 0, info_size); - info->jdk_version = ((jdk_major_version & 0xFF) << 24) | - ((jdk_minor_version & 0xFF) << 16) | - ((jdk_micro_version & 0xFF) << 8) | --- jdk/src/share/native/java/io/io_util.h +++ jdk/src/share/native/java/io/io_util.h @@ -29,7 +29,15 @@ @@ -8260,6 +8249,17 @@ #include #include +--- 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 @@ -65,6 +65,9 @@ @@ -13628,15 +13628,7 @@ #include #endif /* __linux__ */ #include -@@ -40,6 +40,7 @@ - - #include - #include -+#include - #include - #ifndef HEADLESS - #include -@@ -58,10 +59,24 @@ +@@ -59,10 +59,24 @@ extern Display *awt_display; #endif /* !HEADLESS */ @@ -13662,7 +13654,7 @@ /* * This can be set in the makefile to "/usr/X11" if so desired. */ -@@ -111,24 +126,40 @@ +@@ -112,24 +126,40 @@ NULL, /* terminates the list */ }; @@ -13715,7 +13707,7 @@ NULL, /* terminates the list */ }; #endif -@@ -351,7 +382,7 @@ +@@ -357,7 +387,7 @@ #endif /* !HEADLESS */ @@ -13724,7 +13716,7 @@ /* from awt_LoadLibrary.c */ JNIEXPORT jboolean JNICALL AWTIsHeadless(); #endif -@@ -476,8 +507,10 @@ +@@ -482,8 +512,10 @@ */ fcdirs = getFontConfigLocations(); @@ -13736,7 +13728,7 @@ #else /* IF SOLARIS */ knowndirs = fullSolarisFontPath; #endif -@@ -488,7 +521,8 @@ +@@ -494,7 +526,8 @@ * be initialised. */ #ifndef HEADLESS @@ -13746,7 +13738,7 @@ if (!AWTIsHeadless()) { /* .. so need to call a function to check */ #endif AWT_LOCK(); -@@ -496,7 +530,7 @@ +@@ -502,7 +535,7 @@ x11dirs = getX11FontPath(); } AWT_UNLOCK(); @@ -13755,7 +13747,7 @@ } #endif #endif /* !HEADLESS */ -@@ -608,7 +642,7 @@ +@@ -614,7 +647,7 @@ } #include @@ -13764,7 +13756,7 @@ #include #endif -@@ -654,9 +688,9 @@ +@@ -660,9 +693,9 @@ * certain symbols - and functionality - to be available. * Also add explicit search for .so.1 in case .so symlink doesn't exist. */ @@ -13778,14 +13770,12 @@ } --- jdk/src/solaris/native/sun/awt/gtk2_interface.c +++ jdk/src/solaris/native/sun/awt/gtk2_interface.c -@@ -30,8 +30,9 @@ - #include - #include "gtk2_interface.h" +@@ -32,7 +32,7 @@ #include "java_awt_Transparency.h" -+#include "jvm_md.h" + #include "sizecalc.h" -#define GTK2_LIB "libgtk-x11-2.0.so.0" -+#define GTK2_LIB VERSIONED_JNI_LIB_NAME("gtk-x11-2.0", "0") ++#define GTK2_LIB VERSIONED_JNI_LIB_NAME("libgtk-x11-2.0.so", "0") #define G_TYPE_INVALID G_TYPE_MAKE_FUNDAMENTAL (0) #define G_TYPE_NONE G_TYPE_MAKE_FUNDAMENTAL (1)