12 files changed, 25 insertions, 26 deletions

diff --git a/java/jdk16/Makefile b/java/jdk16/Makefile
index 91e2586cbbde..3d377a8289e6 100644
--- a/java/jdk16/Makefile
+++ b/java/jdk16/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Java Development Kit 1.6.0
 
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
-		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
+		${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
 		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-base
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
@@ -123,7 +123,7 @@ RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 
 MAKE_ENV+=	ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \
-		ALT_MOTIF_DIR="${X11BASE}" \
+		ALT_MOTIF_DIR="${LOCALBASE}" \
 		ALT_DEVTOOLS_PATH="${LOCALBASE}" \
 		LANG="C" \
 		LC_ALL="C" \
@@ -134,7 +134,6 @@ MAKE_ENV+=	ALT_BOOTDIR="${BOOTSTRAPJDKDIR}" \
 		SKIP_COMPARE_IMAGES="true" \
 		SKIP_FASTDEBUG_BUILD="true" \
 		LOCALBASE="${LOCALBASE}" \
-		X11BASE="${X11BASE}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .if defined(WITH_DEBUG)
@@ -287,7 +286,7 @@ post-patch:
 			${WRKSRC}/$${file}; \
 	done
 	@for file in ${X11_FILES}; do \
-		${REINPLACE_CMD} -e "s:%%X11BASE%%:${X11BASE}:" \
+		${REINPLACE_CMD} -e "s:%%LOCALBASE%%:${LOCALBASE}:" \
 			${WRKSRC}/$${file}; \
 	done
 	@for file in ${DESKTOP_FILES}; do \
diff --git a/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk b/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk
index e8530a74dcd3..e67d96183378 100644
--- a/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk
+++ b/java/jdk16/files/patch-deploy-common-Defs-bsd.gmk
@@ -8,7 +8,7 @@ $FreeBSD$
  PATH_SEP       = /
 -X11DIR         = /usr/X11R6
 -LOCALDIR       = /usr/local
-+X11DIR         = ${X11BASE}
++X11DIR         = ${LOCALBASE}
 +LOCALDIR       = ${LOCALBASE}
  ifneq ($(OS_VENDOR), NetBSD)
  LIBS           = -L$(X11DIR)/lib -lX11 -L$(LOCALDIR)/lib -liconv
diff --git a/java/jdk16/files/patch-deploy-jvmnative-Makefile b/java/jdk16/files/patch-deploy-jvmnative-Makefile
index 552150c0531f..5276288296da 100644
--- a/java/jdk16/files/patch-deploy-jvmnative-Makefile
+++ b/java/jdk16/files/patch-deploy-jvmnative-Makefile
@@ -7,7 +7,7 @@ $FreeBSD$
  include $(DEPLOY_TOPDIR)/make/plugin/common/Defs.gmk
  
 -X11DIR = /usr/X11R6
-+X11DIR = ${X11BASE}
++X11DIR = ${LOCALBASE}
  
  ifeq ($(PLATFORM), bsd)
  LDLIBS = -L$(X11DIR)/lib -lX11
diff --git a/java/jdk16/files/patch-deploy-oji-adapter-Makefile b/java/jdk16/files/patch-deploy-oji-adapter-Makefile
index 71126c7066b1..9a9156495e58 100644
--- a/java/jdk16/files/patch-deploy-oji-adapter-Makefile
+++ b/java/jdk16/files/patch-deploy-oji-adapter-Makefile
@@ -6,7 +6,7 @@ $FreeBSD$
  dummy:=$(shell $(MKDIR) -p $(LIB_LOCATION))
  
 -X11DIR = /usr/X11R6
-+X11DIR = ${X11BASE}
++X11DIR = ${LOCALBASE}
  
  ifeq ($(PLATFORM), solaris)
  LDLIBS = -lX11 -ldl -lCrun -lc
diff --git a/java/jdk16/files/patch-deploy-plugin-common-Defs-bsd.gmk b/java/jdk16/files/patch-deploy-plugin-common-Defs-bsd.gmk
index 608e65ba600e..bed54a9c579e 100644
--- a/java/jdk16/files/patch-deploy-plugin-common-Defs-bsd.gmk
+++ b/java/jdk16/files/patch-deploy-plugin-common-Defs-bsd.gmk
@@ -7,4 +7,4 @@ $FreeBSD$
  PLUGIN_PLATFORM_SRC := $(DEPLOY_TOPDIR)/src/plugin/solaris
  
 -OTHER_LDFLAGS = -L/usr/X11R6/lib
-+OTHER_LDFLAGS = -L${X11BASE}/lib
++OTHER_LDFLAGS = -L${LOCALBASE}/lib
diff --git a/java/jdk16/files/patch-deploy-unix-Makefile b/java/jdk16/files/patch-deploy-unix-Makefile
index 332b52f85865..81ab95c41ea8 100644
--- a/java/jdk16/files/patch-deploy-unix-Makefile
+++ b/java/jdk16/files/patch-deploy-unix-Makefile
@@ -7,7 +7,7 @@ $FreeBSD$
  include $(DEPLOY_TOPDIR)/make/plugin/common/Defs.gmk
  
 -X11DIR = /usr/X11R6
-+X11DIR = ${X11BASE}
++X11DIR = ${LOCALBASE}
  
  ifeq ($(PLATFORM), linux)
  LDLIBS = -lX11 -ldl -lc
diff --git a/java/jdk16/files/patch-j2se-awt-fontpath.c b/java/jdk16/files/patch-j2se-awt-fontpath.c
index bebc39f693a4..4105d383d9fe 100644
--- a/java/jdk16/files/patch-j2se-awt-fontpath.c
+++ b/java/jdk16/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/jdk16/files/patch-j2se-awt-mawt.gmk b/java/jdk16/files/patch-j2se-awt-mawt.gmk
index ddbab7154b35..ff56d99d0e55 100644
--- a/java/jdk16/files/patch-j2se-awt-mawt.gmk
+++ b/java/jdk16/files/patch-j2se-awt-mawt.gmk
@@ -7,13 +7,13 @@ $FreeBSD$
          else
          # Allows for builds on Debian GNU Linux, X11 is in a different place 
 -	    LIBXT = $(firstword $(wildcard /usr/X11R6/lib/libXt.a) \
-+	    LIBXT = $(firstword $(wildcard ${X11BASE}/lib/libXt.a) \
++	    LIBXT = $(firstword $(wildcard ${LOCALBASE}/lib/libXt.a) \
                              $(wildcard /usr/lib/libXt.a))
 -	    LIBSM = $(firstword $(wildcard /usr/X11R6/lib/libSM.a) \
-+	    LIBSM = $(firstword $(wildcard ${X11BASE}/lib/libSM.a) \
++	    LIBSM = $(firstword $(wildcard ${LOCALBASE}/lib/libSM.a) \
                              $(wildcard /usr/lib/libSM.a))
 -	    LIBICE = $(firstword $(wildcard /usr/X11R6/lib/libICE.a) \
-+	    LIBICE = $(firstword $(wildcard ${X11BASE}/lib/libICE.a) \
++	    LIBICE = $(firstword $(wildcard ${LOCALBASE}/lib/libICE.a) \
                               $(wildcard /usr/lib/libICE.a))
  	endif
      endif
@@ -23,8 +23,8 @@ $FreeBSD$
  ifeq ($(PLATFORM), bsd)
 -  CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
 -              -I/usr/X11R6/include
-+  CPPFLAGS += -I${X11BASE}/include/X11/extensions \
-+              -I${X11BASE}/include
++  CPPFLAGS += -I${LOCALBASE}/include/X11/extensions \
++              -I${LOCALBASE}/include
  endif
  
  LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
diff --git a/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk b/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk
index 047359445ab4..5dae8f0599a7 100644
--- a/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk
+++ b/java/jdk16/files/patch-j2se-common-Defs-bsd.gmk
@@ -7,7 +7,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           = -D__GLIBC__ -DGNU_ASSEMBLER
  override SUN_CMM_SUBDIR          =
diff --git a/java/jdk16/files/patch-j2se-font-Makefile b/java/jdk16/files/patch-j2se-font-Makefile
index 87630b03f060..22587357fa11 100644
--- a/java/jdk16/files/patch-j2se-font-Makefile
+++ b/java/jdk16/files/patch-j2se-font-Makefile
@@ -7,7 +7,7 @@ $FreeBSD$
  # setup the list of libraries to link in...
  ifeq ($(PLATFORM), bsd)
 -OTHER_INCLUDES += -I/usr/X11R6/include
-+OTHER_INCLUDES += -I${X11BASE}/include
++OTHER_INCLUDES += -I${LOCALBASE}/include
  OTHER_LDLIBS  += -lawt $(LIBM) $(LIBCXX)
  else
  ifeq ($(PLATFORM), linux)
diff --git a/java/jdk16/files/patch-j2se-gtk-Metacity.java b/java/jdk16/files/patch-j2se-gtk-Metacity.java
index eaf393914189..906baec93397 100644
--- a/java/jdk16/files/patch-j2se-gtk-Metacity.java
+++ b/java/jdk16/files/patch-j2se-gtk-Metacity.java
@@ -10,8 +10,8 @@ $FreeBSD$
 -		    "/usr/X11R6/share/gnome/themes",
 -		    "/usr/local/share/themes",
 -		    "/usr/local/share/gnome/themes",
-+		    "%%X11BASE%%/share/themes",
-+		    "%%X11BASE%%/share/gnome/themes",
++		    "%%LOCALBASE%%/share/themes",
++		    "%%LOCALBASE%%/share/gnome/themes",
 +		    "%%LOCALBASE%%/share/themes",
 +		    "%%LOCALBASE%%/share/gnome/themes",
  		    "/usr/share/themes",
diff --git a/java/jdk16/files/patch-j2se-xawt-Makefile b/java/jdk16/files/patch-j2se-xawt-Makefile
index f2517a693e59..2b6f82acaf35 100644
--- a/java/jdk16/files/patch-j2se-xawt-Makefile
+++ b/java/jdk16/files/patch-j2se-xawt-Makefile
@@ -16,7 +16,7 @@ $FreeBSD$
  ifeq ($(PLATFORM), linux)
  # Allows for builds on Debian GNU Linux, X11 is in a different place 
 -  CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
-+  CPPFLAGS += -I${X11BASE}/include/X11/extensions \
++  CPPFLAGS += -I${LOCALBASE}/include/X11/extensions \
                -I/usr/include/X11/extensions \
                -I$(MOTIF_DIR)/include \
                -I$(OPENWIN_HOME)/include 
@@ -24,7 +24,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)