Set rpath for libawt_xawt.so as we do for libawt.so and libawt_headless.so.

Optimize fontconfig.properties while I am here.

3 files changed, 55 insertions, 49 deletions

diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
index 95094c48850b..4a170fa7b888 100644
--- a/java/openjdk8/Makefile
+++ b/java/openjdk8/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	openjdk
 PORTVERSION=	${JDK_MAJOR_VERSION}.${JDK_UPDATE_VERSION}.${JDK_BUILD_NUMBER:S/^0//}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}/promoted/b${DIST_BUILD_NUMBER}/:jdk \
 		https://adopt-openjdk.ci.cloudbees.com/job/jtreg/${JTREG_JENKINS_BUILD}/artifact/:jtreg \
diff --git a/java/openjdk8/files/bsd.fontconfig.properties.in b/java/openjdk8/files/bsd.fontconfig.properties.in
index 26acee0c6eb1..b0fc21502af4 100644
--- a/java/openjdk8/files/bsd.fontconfig.properties.in
+++ b/java/openjdk8/files/bsd.fontconfig.properties.in
@@ -32,126 +32,126 @@ version=1
 # Component Font Mappings
 
 dialog.plain.latin-1=DejaVu Sans
-dialog.plain.chinese-big5=AR PL UMing TW
-dialog.plain.chinese-gb18030=AR PL UMing CN
+dialog.plain.chinese-big5=AR PL UMing
+dialog.plain.chinese-gb18030=AR PL UMing
 dialog.plain.japanese-x0208=Sazanami Gothic
 dialog.plain.korean=NanumGothic
 
 dialog.bold.latin-1=DejaVu Sans Bold
-dialog.bold.chinese-big5=AR PL UMing TW
-dialog.bold.chinese-gb18030=AR PL UMing CN
+dialog.bold.chinese-big5=AR PL UMing
+dialog.bold.chinese-gb18030=AR PL UMing
 dialog.bold.japanese-x0208=Sazanami Gothic
 dialog.bold.korean=NanumGothicExtraBold
 
 dialog.italic.latin-1=DejaVu Sans Oblique
-dialog.italic.chinese-big5=AR PL UMing TW
-dialog.italic.chinese-gb18030=AR PL UMing CN
+dialog.italic.chinese-big5=AR PL UMing
+dialog.italic.chinese-gb18030=AR PL UMing
 dialog.italic.japanese-x0208=Sazanami Gothic
 dialog.italic.korean=NanumGothic
 
 dialog.bolditalic.latin-1=DejaVu Sans Bold Oblique
-dialog.bolditalic.chinese-big5=AR PL UMing TW
-dialog.bolditalic.chinese-gb18030=AR PL UMing CN
+dialog.bolditalic.chinese-big5=AR PL UMing
+dialog.bolditalic.chinese-gb18030=AR PL UMing
 dialog.bolditalic.japanese-x0208=Sazanami Gothic
 dialog.bolditalic.korean=NanumGothicExtraBold
 
 
 sansserif.plain.latin-1=DejaVu Sans
-sansserif.plain.chinese-big5=AR PL UMing TW
-sansserif.plain.chinese-gb18030=AR PL UMing CN
+sansserif.plain.chinese-big5=AR PL UMing
+sansserif.plain.chinese-gb18030=AR PL UMing
 sansserif.plain.japanese-x0208=Sazanami Gothic
 sansserif.plain.korean=NanumGothic
 
 sansserif.bold.latin-1=DejaVu Sans Bold
-sansserif.bold.chinese-big5=AR PL UMing TW
-sansserif.bold.chinese-gb18030=AR PL UMing CN
+sansserif.bold.chinese-big5=AR PL UMing
+sansserif.bold.chinese-gb18030=AR PL UMing
 sansserif.bold.japanese-x0208=Sazanami Gothic
 sansserif.bold.korean=NanumGothicExtraBold
 
 sansserif.italic.latin-1=DejaVu Sans Oblique
-sansserif.italic.chinese-big5=AR PL UMing TW
-sansserif.italic.chinese-gb18030=AR PL UMing CN
+sansserif.italic.chinese-big5=AR PL UMing
+sansserif.italic.chinese-gb18030=AR PL UMing
 sansserif.italic.japanese-x0208=Sazanami Gothic
 sansserif.italic.korean=NanumGothic
 
 sansserif.bolditalic.latin-1=DejaVu Sans Bold Oblique
-sansserif.bolditalic.chinese-big5=AR PL UMing TW
-sansserif.bolditalic.chinese-gb18030=AR PL UMing CN
+sansserif.bolditalic.chinese-big5=AR PL UMing
+sansserif.bolditalic.chinese-gb18030=AR PL UMing
 sansserif.bolditalic.japanese-x0208=Sazanami Gothic
 sansserif.bolditalic.korean=NanumGothicExtraBold
 
 
 serif.plain.latin-1=DejaVu Serif
-serif.plain.chinese-big5=AR PL UKai TW
-serif.plain.chinese-gb18030=AR PL UKai CN
+serif.plain.chinese-big5=AR PL UKai
+serif.plain.chinese-gb18030=AR PL UKai
 serif.plain.japanese-x0208=Sazanami Mincho
 serif.plain.korean=NanumMyeongjo
 
 serif.bold.latin-1=DejaVu Serif Bold
-serif.bold.chinese-big5=AR PL UKai TW
-serif.bold.chinese-gb18030=AR PL UKai CN
+serif.bold.chinese-big5=AR PL UKai
+serif.bold.chinese-gb18030=AR PL UKai
 serif.bold.japanese-x0208=Sazanami Mincho
 serif.bold.korean=NanumMyeongjoExtraBold
 
 serif.italic.latin-1=DejaVu Serif Italic
-serif.italic.chinese-big5=AR PL UKai TW
-serif.italic.chinese-gb18030=AR PL UKai CN
+serif.italic.chinese-big5=AR PL UKai
+serif.italic.chinese-gb18030=AR PL UKai
 serif.italic.japanese-x0208=Sazanami Mincho
 serif.italic.korean=NanumMyeongjo
 
 serif.bolditalic.latin-1=DejaVu Serif Bold Italic
-serif.bolditalic.chinese-big5=AR PL UKai TW
-serif.bolditalic.chinese-gb18030=AR PL UKai CN
+serif.bolditalic.chinese-big5=AR PL UKai
+serif.bolditalic.chinese-gb18030=AR PL UKai
 serif.bolditalic.japanese-x0208=Sazanami Mincho
 serif.bolditalic.korean=NanumMyeongjoExtraBold
 
 
 monospaced.plain.latin-1=DejaVu Sans Mono
-monospaced.plain.chinese-big5=AR PL UMing TW
-monospaced.plain.chinese-gb18030=AR PL UMing CN
+monospaced.plain.chinese-big5=AR PL UMing
+monospaced.plain.chinese-gb18030=AR PL UMing
 monospaced.plain.japanese-x0208=Sazanami Gothic
 monospaced.plain.korean=NanumGothic
 
 monospaced.bold.latin-1=DejaVu Sans Mono Bold
-monospaced.bold.chinese-big5=AR PL UMing TW
-monospaced.bold.chinese-gb18030=AR PL UMing CN
+monospaced.bold.chinese-big5=AR PL UMing
+monospaced.bold.chinese-gb18030=AR PL UMing
 monospaced.bold.japanese-x0208=Sazanami Gothic
 monospaced.bold.korean=NanumGothicExtraBold
 
 monospaced.italic.latin-1=DejaVu Sans Mono Oblique
-monospaced.italic.chinese-big5=AR PL UMing TW
-monospaced.italic.chinese-gb18030=AR PL UMing CN
+monospaced.italic.chinese-big5=AR PL UMing
+monospaced.italic.chinese-gb18030=AR PL UMing
 monospaced.italic.japanese-x0208=Sazanami Gothic
 monospaced.italic.korean=NanumGothic
 
 monospaced.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
-monospaced.bolditalic.chinese-big5=AR PL UMing TW
-monospaced.bolditalic.chinese-gb18030=AR PL UMing CN
+monospaced.bolditalic.chinese-big5=AR PL UMing
+monospaced.bolditalic.chinese-gb18030=AR PL UMing
 monospaced.bolditalic.japanese-x0208=Sazanami Gothic
 monospaced.bolditalic.korean=NanumGothicExtraBold
 
 
 dialoginput.plain.latin-1=DejaVu Sans Mono
-dialoginput.plain.chinese-big5=AR PL UMing TW
-dialoginput.plain.chinese-gb18030=AR PL UMing CN
+dialoginput.plain.chinese-big5=AR PL UMing
+dialoginput.plain.chinese-gb18030=AR PL UMing
 dialoginput.plain.japanese-x0208=Sazanami Gothic
 dialoginput.plain.korean=NanumGothic
 
 dialoginput.bold.latin-1=DejaVu Sans Mono Bold
-dialoginput.bold.chinese-big5=AR PL UMing TW
-dialoginput.bold.chinese-gb18030=AR PL UMing CN
+dialoginput.bold.chinese-big5=AR PL UMing
+dialoginput.bold.chinese-gb18030=AR PL UMing
 dialoginput.bold.japanese-x0208=Sazanami Gothic
 dialoginput.bold.korean=NanumGothicExtraBold
 
 dialoginput.italic.latin-1=DejaVu Sans Mono Oblique
-dialoginput.italic.chinese-big5=AR PL UMing TW
-dialoginput.italic.chinese-gb18030=AR PL UMing CN
+dialoginput.italic.chinese-big5=AR PL UMing
+dialoginput.italic.chinese-gb18030=AR PL UMing
 dialoginput.italic.japanese-x0208=Sazanami Gothic
 dialoginput.italic.korean=NanumGothic
 
 dialoginput.bolditalic.latin-1=DejaVu Sans Mono Bold Oblique
-dialoginput.bolditalic.chinese-big5=AR PL UMing TW
-dialoginput.bolditalic.chinese-gb18030=AR PL UMing CN
+dialoginput.bolditalic.chinese-big5=AR PL UMing
+dialoginput.bolditalic.chinese-gb18030=AR PL UMing
 dialoginput.bolditalic.japanese-x0208=Sazanami Gothic
 dialoginput.bolditalic.korean=NanumGothicExtraBold
 
@@ -181,10 +181,8 @@ filename.DejaVu_Serif_Bold=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSerif-Bold.ttf
 filename.DejaVu_Serif_Italic=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSerif-Italic.ttf
 filename.DejaVu_Serif_Bold_Italic=%%LOCALBASE%%/share/fonts/dejavu/DejaVuSerif-BoldItalic.ttf
 
-filename.AR_PL_UKai_TW=%%LOCALBASE%%/share/fonts/TrueType/ukai.ttc
-filename.AR_PL_UMing_TW=%%LOCALBASE%%/share/fonts/TrueType/uming.ttc
-filename.AR_PL_UKai_CN=%%LOCALBASE%%/share/fonts/TrueType/ukai.ttc
-filename.AR_PL_UMing_CN=%%LOCALBASE%%/share/fonts/TrueType/uming.ttc
+filename.AR_PL_UMing=%%LOCALBASE%%/share/fonts/TrueType/uming.ttc
+filename.AR_PL_UKai=%%LOCALBASE%%/share/fonts/TrueType/ukai.ttc
 
 filename.Sazanami_Gothic=%%LOCALBASE%%/share/font-sazanami/sazanami-gothic.ttf
 filename.Sazanami_Mincho=%%LOCALBASE%%/share/font-sazanami/sazanami-mincho.ttf
diff --git a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
index cb9a8ae380cd..679ce886e7ad 100644
--- a/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
+++ b/java/openjdk8/files/patch-jdk-make-lib-Awt2dLibraries.gmk
@@ -1,6 +1,14 @@
---- jdk/make/lib/Awt2dLibraries.gmk.orig	2014-11-08 19:54:51.000000000 -0800
-+++ jdk/make/lib/Awt2dLibraries.gmk	2014-11-08 19:56:30.000000000 -0800
-@@ -1257,7 +1257,7 @@
+--- jdk/make/lib/Awt2dLibraries.gmk.orig	2015-03-25 15:50:52.527704000 -0400
++++ jdk/make/lib/Awt2dLibraries.gmk	2015-03-25 17:59:54.197133000 -0400
+@@ -664,6 +664,7 @@
+             -R/usr/dt/lib$(OPENJDK_TARGET_CPU_ISADIR) \
+             $(call SET_SHARED_LIBRARY_ORIGIN) \
+             $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
++        LDFLAGS_bsd := $(call SET_SHARED_LIBRARY_ORIGIN), \
+         LDFLAGS_SUFFIX := $(LIBAWT_XAWT_LDFLAGS_SUFFIX), \
+         VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+         RC_FLAGS := $(RC_FLAGS) \
+@@ -1257,7 +1258,7 @@
    else ifeq ($(OPENJDK_TARGET_OS), solaris)
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 -I$(OPENWIN_HOME)/include -I$(OPENWIN_HOME)/include/X11/extensions
    else ifeq ($(OPENJDK_TARGET_OS), bsd)
@@ -9,7 +17,7 @@
    else
      LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS)
    endif
-@@ -1282,7 +1282,7 @@
+@@ -1282,7 +1283,7 @@
      # Solaris still uses OPENWIN_LIB ..
      LIBSPLASHSCREEN_LDFLAGS_SUFFIX += -L$(OPENWIN_LIB)$(OPENJDK_TARGET_CPU_ISADIR) -lX11 -lXext $(LIBM) -lpthread
    else ifeq ($(OPENJDK_TARGET_OS), bsd)