From 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Sat, 19 Apr 2008 17:56:05 +0000 Subject: - Remove unneeded dependency from gtk12/gtk20 [1] - Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG - Remove X11BASE support in favor of LOCALBASE or PREFIX - Use USE_LDCONFIG instead of INSTALLS_SHLIB - Remove unneeded USE_GCC 3.4+ Thanks to all Helpers: Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr, ehaupt, nox, itetcu, flz, pav PR: 116263 Tested on: pointyhat Approved by: portmgr (pav) --- java/jdk15/files/patch-j2se::awt::fontpath.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'java/jdk15/files/patch-j2se::awt::fontpath.c') diff --git a/java/jdk15/files/patch-j2se::awt::fontpath.c b/java/jdk15/files/patch-j2se::awt::fontpath.c index 4c941d36bb11..d6e977139e99 100644 --- a/java/jdk15/files/patch-j2se::awt::fontpath.c +++ b/java/jdk15/files/patch-j2se::awt::fontpath.c @@ -11,11 +11,11 @@ $FreeBSD$ - "/usr/X11R6/lib/X11/fonts/tt", - "/usr/X11R6/lib/X11/fonts/TTF", - "/usr/X11R6/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ -+ "%%X11BASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */ -+ "%%X11BASE%%/lib/X11/fonts/truetype", /* SuSE */ -+ "%%X11BASE%%/lib/X11/fonts/tt", -+ "%%X11BASE%%/lib/X11/fonts/TTF", -+ "%%X11BASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ ++ "%%LOCALBASE%%/lib/X11/fonts/TrueType", /* RH 7.1+ */ ++ "%%LOCALBASE%%/lib/X11/fonts/truetype", /* SuSE */ ++ "%%LOCALBASE%%/lib/X11/fonts/tt", ++ "%%LOCALBASE%%/lib/X11/fonts/TTF", ++ "%%LOCALBASE%%/lib/X11/fonts/OTF", /* RH 9.0 (but empty!) */ "/usr/share/fonts/ja/TrueType", /* RH 7.2+ */ "/usr/share/fonts/truetype", "/usr/share/fonts/ko/TrueType", /* RH 9.0 */ @@ -23,7 +23,7 @@ $FreeBSD$ "/usr/share/fonts/zh_TW/TrueType", /* RH 9.0 */ "/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType", /* Debian */ - "/usr/X11R6/lib/X11/fonts/Type1", -+ "%%X11BASE%%/lib/X11/fonts/Type1", ++ "%%LOCALBASE%%/lib/X11/fonts/Type1", "/usr/share/fonts/default/Type1", /* RH 9.0 */ NULL, /* terminates the list */ }; -- cgit v1.2.3