aboutsummaryrefslogtreecommitdiff
path: root/java/jdk15/files
diff options
context:
space:
mode:
Diffstat (limited to 'java/jdk15/files')
-rw-r--r--java/jdk15/files/patch-deploy::common::config.gmk4
-rw-r--r--java/jdk15/files/patch-deploy::jvmnative::Makefile2
-rw-r--r--java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk2
-rw-r--r--java/jdk15/files/patch-deploy::ns7-adapter::Makefile2
-rw-r--r--java/jdk15/files/patch-deploy::nscore::Makefile2
-rw-r--r--java/jdk15/files/patch-j2se::awt::fontpath.c12
-rw-r--r--java/jdk15/files/patch-j2se::awt::mawt.gmk8
-rw-r--r--java/jdk15/files/patch-j2se::common::Defs-bsd.gmk2
-rw-r--r--java/jdk15/files/patch-j2se::font::Makefile2
-rw-r--r--java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java4
-rw-r--r--java/jdk15/files/patch-j2se::gtk::Metacity.java4
-rw-r--r--java/jdk15/files/patch-j2se::xawt::Makefile2
12 files changed, 23 insertions, 23 deletions
diff --git a/java/jdk15/files/patch-deploy::common::config.gmk b/java/jdk15/files/patch-deploy::common::config.gmk
index b9592c5b0206..cc8d9bca67da 100644
--- a/java/jdk15/files/patch-deploy::common::config.gmk
+++ b/java/jdk15/files/patch-deploy::common::config.gmk
@@ -7,10 +7,10 @@ $FreeBSD$
ifeq ($(LINUX_OR_BSD), true)
PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/solaris
- OTHER_LDFLAGS = -L/usr/X11R6/lib
-+ OTHER_LDFLAGS = -L$(X11BASE)/lib
++ OTHER_LDFLAGS = -L$(LOCALBASE)/lib
ifeq ($(TRUE_PLATFORM), NetBSD)
- OTHER_LDFLAGS += -Wl,-R/usr/X11R6/lib
-+ OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib
++ OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib
endif
endif
diff --git a/java/jdk15/files/patch-deploy::jvmnative::Makefile b/java/jdk15/files/patch-deploy::jvmnative::Makefile
index 9ae13e14bff6..c34cd2ef67d9 100644
--- a/java/jdk15/files/patch-deploy::jvmnative::Makefile
+++ b/java/jdk15/files/patch-deploy::jvmnative::Makefile
@@ -7,7 +7,7 @@ $FreeBSD$
ifeq ($(PLATFORM), bsd)
LDLIBS = -lm -lX11
-X11HDRDIR = /usr/X11R6/include
-+X11HDRDIR = $(X11BASE)/include
++X11HDRDIR = $(LOCALBASE)/include
else
X11HDRDIR =
ifeq ($(PLATFORM), linux)
diff --git a/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk b/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk
index 9f7709c6cac1..329918750ea2 100644
--- a/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-deploy::make::common::Defs-bsd.gmk
@@ -8,7 +8,7 @@ $FreeBSD$
PATH_SEP = /
-X11DIR = /usr/X11R6
-LOCALDIR = /usr/local
-+X11DIR = $(X11BASE)
++X11DIR = $(LOCALBASE)
+LOCALDIR = $(LOCALBASE)
ifneq ($(TRUE_PLATFORM), NetBSD)
LIBS = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv
diff --git a/java/jdk15/files/patch-deploy::ns7-adapter::Makefile b/java/jdk15/files/patch-deploy::ns7-adapter::Makefile
index 3a53b9077fa7..70dd4533e762 100644
--- a/java/jdk15/files/patch-deploy::ns7-adapter::Makefile
+++ b/java/jdk15/files/patch-deploy::ns7-adapter::Makefile
@@ -8,7 +8,7 @@ $FreeBSD$
MOZHDRDIR = $(subst \,/,$(MOZILLA_HEADERS_PATH)/mozilla_headers_ns7)
-X11HDRDIR = /usr/X11R6/include
-ICONVHDRDIR = /usr/local/include
-+X11HDRDIR = $(X11BASE)/include
++X11HDRDIR = $(LOCALBASE)/include
+ICONVHDRDIR = $(LOCALBASE)/include
NSPRHDRDIR = $(NSPR_HEADERS_PATH)
else
diff --git a/java/jdk15/files/patch-deploy::nscore::Makefile b/java/jdk15/files/patch-deploy::nscore::Makefile
index 1ce85cbd831a..02feb9d6b594 100644
--- a/java/jdk15/files/patch-deploy::nscore::Makefile
+++ b/java/jdk15/files/patch-deploy::nscore::Makefile
@@ -8,7 +8,7 @@ $FreeBSD$
LDLIBS = -lX11
-X11HDRDIR = /usr/X11R6/include
-ICONVHDRDIR = /usr/local/include
-+X11HDRDIR = $(X11BASE)/include
++X11HDRDIR = $(LOCALBASE)/include
+ICONVHDRDIR = $(LOCALBASE)/include
else
X11HDRDIR =
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 */
};
diff --git a/java/jdk15/files/patch-j2se::awt::mawt.gmk b/java/jdk15/files/patch-j2se::awt::mawt.gmk
index 703e594c9583..d14b8044357b 100644
--- a/java/jdk15/files/patch-j2se::awt::mawt.gmk
+++ b/java/jdk15/files/patch-j2se::awt::mawt.gmk
@@ -9,9 +9,9 @@ $FreeBSD$
- LIBXT = /usr/X11R6/lib/libXt.a
- LIBSM = /usr/X11R6/lib/libSM.a
- LIBICE = /usr/X11R6/lib/libICE.a
-+ LIBXT = $(X11BASE)/lib/libXt.a
-+ LIBSM = $(X11BASE)/lib/libSM.a
-+ LIBICE = $(X11BASE)/lib/libICE.a
++ LIBXT = $(LOCALBASE)/lib/libXt.a
++ LIBSM = $(LOCALBASE)/lib/libSM.a
++ LIBICE = $(LOCALBASE)/lib/libICE.a
endif
endif
else
@@ -20,7 +20,7 @@ $FreeBSD$
ifeq ($(LINUX_OR_BSD), true)
- CPPFLAGS += -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
-+ CPPFLAGS += -I$(X11BASE)/include -I$(X11BASE)/include/X11/extensions
++ CPPFLAGS += -I$(LOCALBASE)/include -I$(LOCALBASE)/include/X11/extensions
endif
ifeq ($(PLATFORM), solaris)
diff --git a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
index 772486e9dbf2..a5ab5cf29827 100644
--- a/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
+++ b/java/jdk15/files/patch-j2se::common::Defs-bsd.gmk
@@ -16,7 +16,7 @@ $FreeBSD$
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = false
-override OPENWIN_HOME = /usr/X11R6
-+override OPENWIN_HOME = $(X11BASE)
++override OPENWIN_HOME = $(LOCALBASE)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib
override OTHER_M4FLAGS = -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =
diff --git a/java/jdk15/files/patch-j2se::font::Makefile b/java/jdk15/files/patch-j2se::font::Makefile
index 92c2e00e4c8b..da8093d867fa 100644
--- a/java/jdk15/files/patch-j2se::font::Makefile
+++ b/java/jdk15/files/patch-j2se::font::Makefile
@@ -7,7 +7,7 @@ $FreeBSD$
ifeq ($(PLATFORM), bsd)
# XXXBSD: why here?
-OTHER_INCLUDES += -I/usr/X11R6/include
-+OTHER_INCLUDES += -I$(X11BASE)/include
++OTHER_INCLUDES += -I$(LOCALBASE)/include
OTHER_LDLIBS += -lawt$(SUFFIX) $(LIBM) $(LIBCXX)
else
ifeq ($(PLATFORM), linux)
diff --git a/java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java b/java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java
index c9ca568af784..198a71a256bc 100644
--- a/java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java
+++ b/java/jdk15/files/patch-j2se::gtk::GTKLookAndFeel.java
@@ -8,8 +8,8 @@ $FreeBSD$
System.getProperty("swing.gtkthemedir"),
- "/usr/X11R6/share/gnome/themes", // FreeBSD
- "/usr/X11R6/share/themes", // FreeBSD
-+ "%%X11BASE%%/share/gnome/themes", // FreeBSD
-+ "%%X11BASE%%/share/themes", // FreeBSD
++ "%%LOCALBASE%%/share/gnome/themes", // FreeBSD
++ "%%LOCALBASE%%/share/themes", // FreeBSD
"/usr/share/themes" // Debian/Redhat/Solaris/SuSE
};
diff --git a/java/jdk15/files/patch-j2se::gtk::Metacity.java b/java/jdk15/files/patch-j2se::gtk::Metacity.java
index 1d705f5503b5..8f79c2119711 100644
--- a/java/jdk15/files/patch-j2se::gtk::Metacity.java
+++ b/java/jdk15/files/patch-j2se::gtk::Metacity.java
@@ -8,8 +8,8 @@ $FreeBSD$
System.getProperty("swing.metacitythemedir"),
- "/usr/X11R6/share/themes",
- "/usr/X11R6/share/gnome/themes",
-+ "%%X11BASE%%/share/themes",
-+ "%%X11BASE%%/share/gnome/themes",
++ "%%LOCALBASE%%/share/themes",
++ "%%LOCALBASE%%/share/gnome/themes",
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
diff --git a/java/jdk15/files/patch-j2se::xawt::Makefile b/java/jdk15/files/patch-j2se::xawt::Makefile
index 6220ec692520..f1ca39bbdf28 100644
--- a/java/jdk15/files/patch-j2se::xawt::Makefile
+++ b/java/jdk15/files/patch-j2se::xawt::Makefile
@@ -7,7 +7,7 @@ $FreeBSD$
ifeq ($(PLATFORM), bsd)
- CPPFLAGS += -I/usr/X11R6/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
-+ CPPFLAGS += -I$(X11BASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
++ CPPFLAGS += -I$(LOCALBASE)/include/X11/extensions -I$(MOTIF_DIR)/include -I$(OPENWIN_HOME)/include
endif
ifeq ($(PLATFORM), solaris)
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-22 10:51:32 +0000