From owner-svn-ports-all@FreeBSD.ORG Thu Apr 17 18:24:48 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 87408CDC; Thu, 17 Apr 2014 18:24:48 +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 7435111FE; Thu, 17 Apr 2014 18:24:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3HIOmg0081003; Thu, 17 Apr 2014 18:24:48 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3HIOlSN081000; Thu, 17 Apr 2014 18:24:47 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201404171824.s3HIOlSN081000@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 17 Apr 2014 18:24:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351489 - 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-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Apr 2014 18:24:48 -0000 Author: jkim Date: Thu Apr 17 18:24:47 2014 New Revision: 351489 URL: http://svnweb.freebsd.org/changeset/ports/351489 QAT: https://qat.redports.org/buildarchive/r351489/ Log: Fix couple of mis-merges. Modified: head/java/openjdk6-jre/Makefile head/java/openjdk6/Makefile head/java/openjdk6/files/patch-set Modified: head/java/openjdk6-jre/Makefile ============================================================================== --- head/java/openjdk6-jre/Makefile Thu Apr 17 17:09:54 2014 (r351488) +++ head/java/openjdk6-jre/Makefile Thu Apr 17 18:24:47 2014 (r351489) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX= -jre Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Thu Apr 17 17:09:54 2014 (r351488) +++ head/java/openjdk6/Makefile Thu Apr 17 18:24:47 2014 (r351489) @@ -3,7 +3,7 @@ PORTNAME= openjdk6 PORTVERSION= b31 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH= 1 CATEGORIES= java devel MASTER_SITES= ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} \ Modified: head/java/openjdk6/files/patch-set ============================================================================== --- head/java/openjdk6/files/patch-set Thu Apr 17 17:09:54 2014 (r351488) +++ head/java/openjdk6/files/patch-set Thu Apr 17 18:24:47 2014 (r351489) @@ -13628,7 +13628,15 @@ #include #endif /* __linux__ */ #include -@@ -59,10 +59,24 @@ +@@ -40,6 +40,7 @@ + + #include + #include ++#include + #include + #include + #ifndef HEADLESS +@@ -59,10 +60,24 @@ extern Display *awt_display; #endif /* !HEADLESS */ @@ -13654,7 +13662,7 @@ /* * This can be set in the makefile to "/usr/X11" if so desired. */ -@@ -112,24 +126,40 @@ +@@ -112,24 +127,40 @@ NULL, /* terminates the list */ }; @@ -13707,7 +13715,7 @@ NULL, /* terminates the list */ }; #endif -@@ -357,7 +387,7 @@ +@@ -357,7 +388,7 @@ #endif /* !HEADLESS */ @@ -13716,7 +13724,7 @@ /* from awt_LoadLibrary.c */ JNIEXPORT jboolean JNICALL AWTIsHeadless(); #endif -@@ -482,8 +512,10 @@ +@@ -482,8 +513,10 @@ */ fcdirs = getFontConfigLocations(); @@ -13728,7 +13736,7 @@ #else /* IF SOLARIS */ knowndirs = fullSolarisFontPath; #endif -@@ -494,7 +526,8 @@ +@@ -494,7 +527,8 @@ * be initialised. */ #ifndef HEADLESS @@ -13738,7 +13746,7 @@ if (!AWTIsHeadless()) { /* .. so need to call a function to check */ #endif AWT_LOCK(); -@@ -502,7 +535,7 @@ +@@ -502,7 +536,7 @@ x11dirs = getX11FontPath(); } AWT_UNLOCK(); @@ -13747,7 +13755,7 @@ } #endif #endif /* !HEADLESS */ -@@ -614,7 +647,7 @@ +@@ -614,7 +648,7 @@ } #include @@ -13756,7 +13764,7 @@ #include #endif -@@ -660,9 +693,9 @@ +@@ -660,9 +694,9 @@ * certain symbols - and functionality - to be available. * Also add explicit search for .so.1 in case .so symlink doesn't exist. */ @@ -13770,8 +13778,11 @@ } --- jdk/src/solaris/native/sun/awt/gtk2_interface.c +++ jdk/src/solaris/native/sun/awt/gtk2_interface.c -@@ -32,7 +32,7 @@ +@@ -30,9 +30,10 @@ + #include + #include "gtk2_interface.h" #include "java_awt_Transparency.h" ++#include "jvm_md.h" #include "sizecalc.h" -#define GTK2_LIB "libgtk-x11-2.0.so.0"