From owner-svn-ports-all@FreeBSD.ORG  Wed Apr 30 04:47:26 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 055EA4C8;
 Wed, 30 Apr 2014 04:47:26 +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 CCC1C1A1F;
 Wed, 30 Apr 2014 04:47:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3U4lPSj036623;
 Wed, 30 Apr 2014 04:47:25 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3U4lPLD036622;
 Wed, 30 Apr 2014 04:47:25 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201404300447.s3U4lPLD036622@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 30 Apr 2014 04:47:25 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352670 - head/java/openjdk7/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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 30 Apr 2014 04:47:26 -0000

Author: jkim
Date: Wed Apr 30 04:47:25 2014
New Revision: 352670
URL: http://svnweb.freebsd.org/changeset/ports/352670
QAT: https://qat.redports.org/buildarchive/r352670/

Log:
  Include bundled header files before others.  For example, this fixes build
  with conflicting header files from graphics/jpeg.  Note OTHER_INCLUDES or
  OTHER_CPPFLAGS may be used instead.  However, I think this is the least
  intrusive change.  Also, note java/openjdk6 already has a similar fix and
  java/openjdk8 does not need it.
  
  Tested by:	Jonathan Chen (jonc at chen dot org dot nz)

Added:
  head/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile   (contents, props changed)

Added: head/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/java/openjdk7/files/patch-jdk-make-sun-splashscreen-Makefile	Wed Apr 30 04:47:25 2014	(r352670)
@@ -0,0 +1,28 @@
+--- jdk/make/sun/splashscreen/Makefile	2013-09-06 14:27:41.000000000 -0400
++++ jdk/make/sun/splashscreen/Makefile	2014-04-30 00:10:52.000000000 -0400
+@@ -61,6 +61,12 @@
+ 
+ CFLAGS += -DSPLASHSCREEN
+ 
++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
++CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
++ifneq ($(SYSTEM_ZLIB),true)
++  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
++endif
++
+ ifeq ($(PLATFORM), macosx)
+   CFLAGS += -DWITH_MACOSX
+ 
+@@ -121,11 +127,7 @@
+   CPPFLAGS += $(call NativeSrcDirList,-I,native/$(PKGDIR)/splashscreen)
+   CPPFLAGS += $(call NativeSrcDirList,-I,/native/sun/osxapp)
+ endif
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
+-CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
+-ifneq ($(SYSTEM_ZLIB),true)
+-  CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+-else
++ifeq ($(SYSTEM_ZLIB),true)
+   OTHER_CFLAGS += $(ZLIB_CFLAGS)
+   OTHER_LDLIBS += $(ZLIB_LIBS)
+ endif