ports/java/jdk16/files/patch-j2se::awt::fontpath.c
Greg Lewis 1bb6af069e . Replace some hardwired /usr/X11R6 instances with X11BASE. [1]
. Replace some hardwired /usr/local instances with LOCALBASE.
. Small Makefile restructure to keep related variables in one place.
. Add ipv6 to CATEGORIES if its enabled. [2]

PR:             106130 [2]
Submitted by:   Janos Mohacsi <janos.mohacsi@bsd.hu> [2]
Pointed out by: pointyhat (via kris) [1]
2006-12-11 17:10:52 +00:00

29 lines
1.3 KiB
C

$FreeBSD$
--- ../../j2se/src/solaris/native/sun/awt/fontpath.c.orig Sun Dec 10 21:57:02 2006
+++ ../../j2se/src/solaris/native/sun/awt/fontpath.c Sun Dec 10 21:58:43 2006
@@ -98,18 +98,18 @@
* various flavors of Linux
*/
static char *fullLinuxFontPath[] = {
- "/usr/X11R6/lib/X11/fonts/TrueType", /* RH 7.1+ */
- "/usr/X11R6/lib/X11/fonts/truetype", /* SuSE */
- "/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!) */
"/usr/share/fonts/ja/TrueType", /* RH 7.2+ */
"/usr/share/fonts/truetype",
"/usr/share/fonts/ko/TrueType", /* RH 9.0 */
"/usr/share/fonts/zh_CN/TrueType", /* RH 9.0 */
"/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",
"/usr/share/fonts/default/Type1", /* RH 9.0 */
NULL, /* terminates the list */
};