47 files changed, 101 insertions, 102 deletions

diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index 05319fc0d46d..aaa0ea81d54e 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	classpath
 PORTVERSION=	0.93
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		${MASTER_SITE_SAVANNAH}
@@ -19,6 +20,7 @@ COMMENT=	A GNU project to create a free Java class library
 BUILD_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 		jikes:${PORTSDIR}/java/jikes
 
+USE_XORG=	x11
 USE_LDCONFIG=	yes
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
diff --git a/java/eclipse-devel/Makefile b/java/eclipse-devel/Makefile
index 6bd855a968ed..a89fa8a14102 100644
--- a/java/eclipse-devel/Makefile
+++ b/java/eclipse-devel/Makefile
@@ -26,8 +26,7 @@ ECLIPSE=	${PORTNAME}
 ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
 USE_ZIP=	yes
-USE_GCC=	3.4+
-USE_GL=		yes
+USE_GL=		glu
 
 .if !defined(WITHOUT_MOZILLA)
 USE_GECKO=	xulrunner firefox mozilla seamonkey
@@ -127,7 +126,7 @@ do-install:
 	@${SED} \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
 	  -e "s+%%PREFIX%%+${PREFIX}+g" \
-	  -e "s+%%X11BASE%%+${X11BASE}+g" \
+	  -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
 	  -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
 	  -e "s+%%BROWSER%%+${BROWSER}+g" \
 	  -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \
diff --git a/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak
index 075a1c7e3d64..d57dcd73014e 100644
--- a/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak
+++ b/java/eclipse-devel/files/post-patch-plugins-swt-gtk-make_freebsd.mak
@@ -5,7 +5,7 @@
  # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
  GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
 -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
-+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst
++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst
  
  CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
  
@@ -14,7 +14,7 @@
  
  GLXCFLAGS = 
 -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
-+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm
++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm
  
  # Uncomment for Native Stats tool
 -#NATIVE_STATS = -DNATIVE_STATS
@@ -26,7 +26,7 @@
  	-Wno-non-virtual-dtor \
  	-fPIC \
  	-I. \
-+	-I$(X11BASE)/include \
++	-I$(LOCALBASE)/include \
  	-I$(JAVA_HOME)/include \
  	-I$(JAVA_HOME)/include/freebsd \
 +	-I$(LOCALBASE)/include/xulrunner \
@@ -53,7 +53,7 @@
  		$(NATIVE_STATS) \
 -		-DLINUX -DGTK \
 +		-DFREEBSD -DGTK \
-+		-I$(X11BASE)/include \
++		-I$(LOCALBASE)/include \
  		-I$(JAVA_HOME)/include \
  		-I$(JAVA_HOME)/include/freebsd \
  		-fPIC \
diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile
index 679b5cd1563e..55f958dde935 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -124,7 +124,6 @@ do-install:
 	@${SED} \
 	  -e "s+%%ECLIPSE_HOME%%+${PORTDESTDIR}+g" \
 	  -e "s+%%PREFIX%%+${PREFIX}+g" \
-	  -e "s+%%X11BASE%%+${X11BASE}+g" \
 	  -e "s+%%LOCALBASE%%+${LOCALBASE}+g" \
 	  -e "s+%%BROWSER%%+${BROWSER}+g" \
 	  -e "s,%%JAVA_VERSION%%,${JAVA_VERSION},g" \
diff --git a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
index b9e4b6e9bae7..b08943add954 100644
--- a/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
+++ b/java/eclipse/files/post-patch-plugins-swt-gtk-make_freebsd.mak
@@ -5,7 +5,7 @@
  # Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
  GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
 -GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L/usr/X11R6/lib $(XLIB64) -lXtst
-+GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(X11BASE)/lib $(XLIB64) -lXtst
++GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -L$(LOCALBASE)/lib $(XLIB64) -lXtst
  
  CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
  
@@ -14,7 +14,7 @@
  
  GLXCFLAGS = 
 -GLXLIBS = -shared -fPIC -L/usr/X11R6/lib -lGL -lGLU -lm
-+GLXLIBS = -shared -fPIC -L$(X11BASE)/lib -lGL -lGLU -lm
++GLXLIBS = -shared -fPIC -L$(LOCALBASE)/lib -lGL -lGLU -lm
  
  # Uncomment for Native Stats tool
  #NATIVE_STATS = -DNATIVE_STATS
@@ -37,7 +37,7 @@
 +		-DFREEBSD -DGTK \
  		-I$(JAVA_HOME)/include \
  		-I$(JAVA_HOME)/include/freebsd \
-+                -I$(X11BASE)/include \
++                -I$(LOCALBASE)/include \
  		-fPIC \
  		${SWT_PTR_CFLAGS}
  LIBS = -shared -fPIC -s
diff --git a/java/gjdoc/Makefile b/java/gjdoc/Makefile
index ef4e5d385dac..a470135d9bf5 100644
--- a/java/gjdoc/Makefile
+++ b/java/gjdoc/Makefile
@@ -25,7 +25,7 @@ ANTLRVER=	2.7.5
 ANTLR=		antlr-${ANTLRVER}
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-antlr-jar=${ANTLR}.jar
 CONFIGURE_ENV=	PATH="${WRKDIR}/bin:${PATH}" LDFLAGS="${PTHREAD_LIBS}"
 MAKE_ENV=	PATH="${WRKDIR}/bin:${PATH}"
diff --git a/java/jc/Makefile b/java/jc/Makefile
index 6d9a8119d3a1..05fcac63422c 100644
--- a/java/jc/Makefile
+++ b/java/jc/Makefile
@@ -25,7 +25,7 @@ MAN1=		jc.1
 USE_JAVA=	yes
 USE_GMAKE=	yes
 JAVA_BUILD=	jre
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-classpath=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
diff --git a/java/jdk13/Makefile b/java/jdk13/Makefile
index 4b5e54b7293b..c63b3a82cf2a 100644
--- a/java/jdk13/Makefile
+++ b/java/jdk13/Makefile
@@ -20,21 +20,21 @@ COMMENT=	Java Development Kit 1.3
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
-		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
+		${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 .if defined(WITH_PLUGIN)
 FORBIDDEN=	Vulnerabilities in the browser plugin
 USE_GNOME+=	gtk12
 LIB_DEPENDS=	nspr4.1:$(PORTSDIR)/devel/nspr
 .endif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
-		${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
+		${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif \
+		${LOCALBASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
 
 .if defined(WITH_JAPANESE_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/TrueType/fonts.dir.kochi:${PORTSDIR}/japanese/kochi-ttfonts
 .endif
 .if defined(WITH_RUSSIAN_FONTS)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/webfonts/fonts.dir:${PORTSDIR}/x11-fonts/webfonts
 .endif
 .if defined(WITH_CHINESE_FONTS)
 RUN_DEPENDS+=	${LOCALBASE}/share/fonts/TrueType/arphic:${PORTSDIR}/chinese/arphicttf
@@ -53,8 +53,8 @@ USE_XORG=	ice sm x11 xext xp xt xtst
 RESTRICTED=	"Redistribution of pre-compiled binaries is not permitted"
 NO_CDROM=	"Redistribution of pre-compiled binaries is not permitted"
 MAKE_ENV=	ALT_BOOTDIR="${JDK13DIR}" \
-		ALT_MOTIF_DIR="${X11BASE}" \
-		OPENWINHOME="${X11BASE}" \
+		ALT_MOTIF_DIR="${LOCALBASE}" \
+		OPENWINHOME="${LOCALBASE}" \
 		SYS_CFLAGS="${CFLAGS}" \
 		CLASSPATH="" \
 		LD_LIBRARY_PATH="" \
@@ -204,7 +204,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
 
diff --git a/java/jdk13/files/patch-common::Defs-bsd.gmk b/java/jdk13/files/patch-common::Defs-bsd.gmk
index 686183aca934..218f8124fc5d 100644
--- a/java/jdk13/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk13/files/patch-common::Defs-bsd.gmk
@@ -42,7 +42,7 @@ $FreeBSD$
  override MOOT_PRIORITIES         = true
  override NO_INTERRUPTIBLE_IO     = true
 -override OPENWINHOME             = /usr/X11R6
-+override OPENWINHOME             = $(X11BASE)
++override OPENWINHOME             = $(LOCALBASE)
  override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
  override PREPROCESS_BEFORE_AS    = true
  override PRIVATIZE_JVM_SYMBOLS   = false
@@ -51,7 +51,7 @@ $FreeBSD$
      LDFLAGS_COMMON += -L$(MOTIF_DIR)/lib -L/usr/X11R6/lib # for libXp
    else
 -    MOTIF_DIR=/usr/X11R6
-+    MOTIF_DIR=$(X11BASE)
++    MOTIF_DIR=$(LOCALBASE)
    endif
  endif
  ifdef ALT_MOTIF_DIR
diff --git a/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c
index 625ddf294d3a..c946715d313a 100644
--- a/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c
+++ b/java/jdk13/files/patch-j2sdk1.3.1-font-fontpath.c
@@ -7,7 +7,7 @@ $FreeBSD$
  {
  #ifndef __solaris__
 -   char *ptr   = "/usr/X11R6/lib/X11/fonts/Type1:/usr/X11R6/lib/X11/fonts/TrueType:/usr/X11R6/lib/X11/fonts/tt";
-+   char *ptr   = "%%X11BASE%%/lib/X11/fonts/Type1:%%X11BASE%%/lib/X11/fonts/TrueType:%%X11BASE%%/lib/X11/fonts/tt";
++   char *ptr   = "%%LOCALBASE%%/lib/X11/fonts/Type1:%%LOCALBASE%%/lib/X11/fonts/TrueType:%%LOCALBASE%%/lib/X11/fonts/tt";
  #else
      char *ptr   = getSolarisFontLocations((int) (noType1==JNI_TRUE));
  #endif
diff --git a/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile
index 48d25a056617..2b1f220208e2 100644
--- a/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile
+++ b/java/jdk13/files/patch-j2sdk1.3.1-solaris-GNUmakefile
@@ -17,8 +17,8 @@ $FreeBSD$
  
 -X11_INCLUDE=/usr/X11R6/include
 -X11_LIB=/usr/X11R6/lib
-+X11_INCLUDE=$(X11BASE)/include
-+X11_LIB=$(X11BASE)/lib
++X11_INCLUDE=$(LOCALBASE)/include
++X11_LIB=$(LOCALBASE)/lib
  MOTIF_INCLUDE = $(MOTIF_DIR)/include
  MOTIF_LIB     = $(MOTIF_DIR)/lib
  INTL_INCLUDE  = $(INTL_DIR)/include
diff --git a/java/jdk14/Makefile b/java/jdk14/Makefile
index edb208d4faab..a8e5b0e5ef53 100644
--- a/java/jdk14/Makefile
+++ b/java/jdk14/Makefile
@@ -38,7 +38,7 @@ OPTIONS=	DEBUG	"Enable debugging support"	off \
 .if defined(WITH_OPENMOTIF_JDK)
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/x11-toolkits/open-motif-jdk:extract
 .else
-BUILD_DEPENDS+=	${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 .endif
 
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -86,13 +86,13 @@ EXTRACT_ONLY+=	${TZUPDATEFILE}
 .endif
 
 .if defined(WITH_WEB)
-RUN_DEPENDS+=	${X11BASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
+RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/URW/fonts.dir:${PORTSDIR}/x11-fonts/urwfonts
 .endif
 
 .if defined(WITH_OPENMOTIF_JDK)
 OPENMOTIF_DIR=	${WRKDIR}/jdkmotif
 .else
-OPENMOTIF_DIR=	${X11BASE}
+OPENMOTIF_DIR=	${LOCALBASE}
 .endif
 
 # do we have valid native jdk installed?
@@ -264,7 +264,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
 
diff --git a/java/jdk14/files/patch-common::Defs-bsd.gmk b/java/jdk14/files/patch-common::Defs-bsd.gmk
index 62700f5e915d..9961a41e5476 100644
--- a/java/jdk14/files/patch-common::Defs-bsd.gmk
+++ b/java/jdk14/files/patch-common::Defs-bsd.gmk
@@ -35,7 +35,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/jdk14/files/patch-deploy::common::Defs-bsd.gmk b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk
index f1e910795a6c..6d002d730646 100644
--- a/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk
+++ b/java/jdk14/files/patch-deploy::common::Defs-bsd.gmk
@@ -7,7 +7,7 @@ $FreeBSD$
  CLASSPATH_SEP  = $(CLASSPATH_SEPARATOR)
  PATH_SEP       = /
 -X11DIR         = /usr/X11R6
-+X11DIR         = $(X11BASE)
++X11DIR         = $(LOCALBASE)
  ifneq (,$(filter-out NetBSD DragonFly,$(TRUE_PLATFORM)))
  LIBS           = -L$(X11DIR)/lib -lX11
  else
diff --git a/java/jdk14/files/patch-j2se::awt::fontpath.c b/java/jdk14/files/patch-j2se::awt::fontpath.c
index 0c940b145a94..502c7a751375 100644
--- a/java/jdk14/files/patch-j2se::awt::fontpath.c
+++ b/java/jdk14/files/patch-j2se::awt::fontpath.c
@@ -10,10 +10,10 @@ $FreeBSD$
 -          "/usr/X11R6/lib/X11/fonts/TrueType:"
 -          "/usr/X11R6/lib/X11/fonts/tt:"
 -          "/usr/share/fonts/ja/TrueType";
-+    ptr = "%%X11BASE%%/lib/X11/fonts/Type1:"
-+          "%%X11BASE%%/lib/X11/fonts/TrueType:"
-+          "%%X11BASE%%/lib/X11/fonts/tt:"
-+          "%%X11BASE%%/fonts/ja/TrueType";
++    ptr = "%%LOCALBASE%%/lib/X11/fonts/Type1:"
++          "%%LOCALBASE%%/lib/X11/fonts/TrueType:"
++          "%%LOCALBASE%%/lib/X11/fonts/tt:"
++          "%%LOCALBASE%%/fonts/ja/TrueType";
  #elif defined( HEADLESS )
      ptr = getSolarisFontLocations(env, (int) (noType1==JNI_TRUE));
  #elif SCAN_FONT_DIRS
diff --git a/java/jdk14/files/patch-plugin::common::config.gmk b/java/jdk14/files/patch-plugin::common::config.gmk
index d8a025a8d336..95e1c36717aa 100644
--- a/java/jdk14/files/patch-plugin::common::config.gmk
+++ b/java/jdk14/files/patch-plugin::common::config.gmk
@@ -6,16 +6,16 @@ $FreeBSD$
  
  ifeq ($(PLATFORM), bsd)
    PLUGIN_PLATFORM_SRC := $(PLUGIN_TOP)/src/plugin/src/solaris
--  X11BASE = /usr/X11R6
-   OTHER_LDFLAGS = -L$(X11BASE)/lib
+-  LOCALBASE = /usr/X11R6
+   OTHER_LDFLAGS = -L$(LOCALBASE)/lib
    ifeq (,$(filter-out DragonFly NetBSD,$(TRUE_PLATFORM)))
-     OTHER_LDFLAGS += -Wl,-R$(X11BASE)/lib
+     OTHER_LDFLAGS += -Wl,-R$(LOCALBASE)/lib
 @@ -61,7 +60,7 @@
  
    # include search paths
    # XXXBSD: these should be defined in other place
--  CPPFLAGS1 += -I$(X11BASE)/include -I/usr/local/include
-+  CPPFLAGS1 += -I$(X11BASE)/include -I${LOCALBASE}/include
+-  CPPFLAGS1 += -I$(LOCALBASE)/include -I/usr/local/include
++  CPPFLAGS1 += -I$(LOCALBASE)/include -I${LOCALBASE}/include
  
    ifeq ($(TRUE_PLATFORM), FreeBSD)
        LDFLAGS_COMMON += -pthread
diff --git a/java/jdk14/files/pkg-deinstall.in b/java/jdk14/files/pkg-deinstall.in
index 54724931d7b1..94214557e4d9 100644
--- a/java/jdk14/files/pkg-deinstall.in
+++ b/java/jdk14/files/pkg-deinstall.in
@@ -12,7 +12,7 @@ fi
 # Remove the plugin
 
 # Plugin location variables
-BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
 JAVAPLUGINDIR="%%JRE_HOME%%/plugin/%%ARCH%%/ns610"
 PLUGIN=libjavaplugin_oji.so
 
diff --git a/java/jdk14/files/pkg-install.in b/java/jdk14/files/pkg-install.in
index 53fd8ef1b97c..a57551b91504 100644
--- a/java/jdk14/files/pkg-install.in
+++ b/java/jdk14/files/pkg-install.in
@@ -20,7 +20,7 @@ if [ "$2" = "POST-INSTALL" ]; then
 	fi
 
 	# Install the plugin
-	BROWSERPLUGINDIR="%%X11BASE%%/lib/browser_plugins"
+	BROWSERPLUGINDIR="%%LOCALBASE%%/lib/browser_plugins"
 	JAVAPLUGINDIR="${JRE_HOME}/plugin/%%ARCH%%/ns610"
 	PLUGIN=libjavaplugin_oji.so
 
diff --git a/java/jdk15/Makefile b/java/jdk15/Makefile
index 4fb5cd272fde..24c15b58368c 100644
--- a/java/jdk15/Makefile
+++ b/java/jdk15/Makefile
@@ -20,7 +20,7 @@ COMMENT=	Java Development Kit 1.5.0
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
 		zip:${PORTSDIR}/archivers/zip \
-		${X11BASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
+		${LOCALBASE}/lib/libXm.so:${PORTSDIR}/x11-toolkits/open-motif
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper
 
 OPTIONS=	DEBUG	"Enable debugging support"	off \
@@ -126,7 +126,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}" \
 		DEFAULT_LD_LIBRARY_PATH="/usr/lib:${LOCALBASE}/lib" \
 		SYS_CFLAGS="${CFLAGS}" \
 		LANG="C" \
@@ -281,7 +281,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
 	${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" \
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)
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)
diff --git a/java/jmp/Makefile b/java/jmp/Makefile
index f5810dad8499..76338a4484c4 100644
--- a/java/jmp/Makefile
+++ b/java/jmp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jmp
 PORTVERSION=	0.51
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	http://www.khelekore.org/jmp/ \
 		http://www.klop.ws/~ronald/software-mirrors/
@@ -50,7 +50,7 @@ PLIST_FILES=	lib/libjmp.la lib/libjmp.so lib/libjmp.so.0 \
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=	--enable-noui
 .else
-USE_XLIB=	yes
+USE_XORG=	x11
 LIB_DEPENDS+=	gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20
 .endif
 
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index 11be64b12453..75ea152feb97 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kaffe
 PORTVERSION=	1.1.7.r1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 #MASTER_SITES=	ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/
 MASTER_SITES=	http://www.kaffe.org/~robilad/
@@ -29,14 +29,13 @@ RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip \
 
 ONLY_FOR_ARCHS=	i386 amd64
 
+USE_XORG=	x11 ice xtst
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	CPPFLAGS=-I${LOCALBASE}/include \
 		LDFLAGS=-L${LOCALBASE}/lib \
-		--x-includes=${X11BASE}/include \
-		--x-libraries=${X11BASE}/lib \
 		--with-iconv-prefix=${LOCALBASE}
 PREFIX=		${LOCALBASE}/kaffe
 NO_MTREE=	yes
diff --git a/java/sablevm-classpath/Makefile b/java/sablevm-classpath/Makefile
index 5e4676d1af43..bd07c439401e 100644
--- a/java/sablevm-classpath/Makefile
+++ b/java/sablevm-classpath/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sablevm-classpath
 PORTVERSION=	1.13
+PORTREVISION=	1
 CATEGORIES=	java
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	sablevm
@@ -22,6 +23,7 @@ OPTIONS=	GTK2 "Enable Gtk+ AWT peer" ON \
 
 CONFLICTS=	classpath-*
 
+USE_XORG=	x11 ice xtst
 GNU_CONFIGURE=	yes
 USE_GNOME=	# empty
 USE_GMAKE=	yes
diff --git a/java/simplicity/Makefile b/java/simplicity/Makefile
index b368102080d7..4416836f0615 100644
--- a/java/simplicity/Makefile
+++ b/java/simplicity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	simplicity
 PORTVERSION=	1.2.6b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 MASTER_SITES=	# http://www.datarepresentations.com/products/simplicity/
 DISTNAME=	simpjava
@@ -22,7 +22,6 @@ JDK13DIR?=	${LOCALBASE}/jdk1.3.1
 JAVAVM=		${JDK13DIR}/bin/java
 
 RESTRICTED=	"Restrictive license"
-USE_XLIB=	yes
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/Simplicity