- 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)
author: Martin Wilke <miwi@FreeBSD.org> 2008-04-19 17:56:05 +0000
committer: Martin Wilke <miwi@FreeBSD.org> 2008-04-19 17:56:05 +0000
commit: 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
tree: d573ea09b2bf6be67cb497df199932da9e2707c4 /x11
parent: Update to version 2.2.6 (diff)
527 files changed, 1183 insertions, 1286 deletions
diff --git a/x11-clocks/abclock/files/patch-Makefile b/x11-clocks/abclock/files/patch-Makefile
index 7d51d48d60aa..00c7f758bb4c 100644
--- a/x11-clocks/abclock/files/patch-Makefile
+++ b/x11-clocks/abclock/files/patch-Makefile
@@ -12,14 +12,14 @@
  
 -XLIBDIR = -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/X11R5/lib -L/usr/X11R4/lib \
 -	-L/usr/lib/X11 -L/usr/lib/X11R6 -L/usr/lib/X11R5 -L/usr/lib/X11R4
-+XLIBDIR = -L$(X11BASE)/lib
++XLIBDIR = -L$(LOCALBASE)/lib
  
 -XINCLUDEDIR = -I/usr/X11/include -I/usr/X11R6/include -I/usr/X11R5/include -I/usr/X11R4/include \
 -	-I/usr/include/X11 -I/usr/include/X11R6 -I/usr/include/X11R5 -I/usr/include/X11R4 \
 -	-I/usr/local/X11/include -I/usr/local/X11R6/include -I/usr/local/X11R5/include -I/usr/local/X11R4/include \
 -	-I/usr/local/include/X11 -I/usr/local/include/X11R6 -I/usr/local/include/X11R5 -I/usr/local/include/X11R4 \
 -	-I/usr/X386/include -I/usr/x386/include -I/usr/XFree86/include/X11 -I/usr/local/x11r5/include
-+XINCLUDEDIR = -I$(X11BASE)/include 
++XINCLUDEDIR = -I$(LOCALBASE)/include 
  
  all: abclock abc_img
  
diff --git a/x11-clocks/alltraxclock/Makefile b/x11-clocks/alltraxclock/Makefile
index 595044c0c4c5..0d2d0a27fe64 100644
--- a/x11-clocks/alltraxclock/Makefile
+++ b/x11-clocks/alltraxclock/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}2_0.2-1
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	An analog clock plugin for gkrellm2
 
-BUILD_DEPENDS=	${X11BASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
+BUILD_DEPENDS=	${LOCALBASE}/include/gkrellm2/gkrellm.h:${PORTSDIR}/sysutils/gkrellm2
 RUN_DEPENDS=	gkrellm:${PORTSDIR}/sysutils/gkrellm2
 
 ALL_TARGET=	alltraxclock.so
diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile
index c1334f9617fb..4e29cb0b37be 100644
--- a/x11-clocks/asclock-gtk/Makefile
+++ b/x11-clocks/asclock-gtk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asclock-gtk
 PORTVERSION=	2.1.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-clocks afterstep windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
@@ -19,6 +19,7 @@ COMMENT=	New flavor of asclock (GTK version)
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	asclock
 
+USE_XORG=	x11 xt
 USE_GNOME=	gtk12
 HAS_CONFIGURE=	yes
 
diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 6f6ec275f1d8..d2bf127fd851 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	asclock-xlib
 PORTVERSION=	2.0.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-clocks afterstep windowmaker
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kuriyama
@@ -16,12 +16,12 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	New flavor of asclock
 
 WRKSRC=		${WRKDIR}/asclock-xlib
-USE_XPM=	YES
+USE_XORG=	xpm
 
 .if defined(BATCH)
 USE_IMAKE=	YES
 .else
-USE_X_PREFIX=	YES
+USE_XORG=	x11
 HAS_CONFIGURE=	YES
 .endif
 
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 9a056f4e47ec..33c9710fda67 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Time/Date applet for WindowMaker
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-xpm-library="${X11BASE}/lib" --with-xpm-includes="${X11BASE}/include/X11"
+CONFIGURE_ARGS+=--with-xpm-library="${LOCALBASE}/lib" --with-xpm-includes="${LOCALBASE}/include/X11"
 INSTALL_TARGET=	install install.man
 
 MAN1=		astime.1
diff --git a/x11-clocks/astzclock/Makefile b/x11-clocks/astzclock/Makefile
index 62a9e4eda4e7..f7755eb75d3d 100644
--- a/x11-clocks/astzclock/Makefile
+++ b/x11-clocks/astzclock/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	Afterstep clock with some timezone extensions
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		astzclock.1
 PLIST_FILES=	bin/astzclock
 
diff --git a/x11-clocks/bmp-alarm/Makefile b/x11-clocks/bmp-alarm/Makefile
index c2edb024351b..3d80109b6d38 100644
--- a/x11-clocks/bmp-alarm/Makefile
+++ b/x11-clocks/bmp-alarm/Makefile
@@ -23,7 +23,7 @@ GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/bmp/General/libalarm.so
 
-# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/bmp/General
+# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/bmp/General
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/.libs/libalarm.so ${PREFIX}/lib/bmp/General
 
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index af585fe9d767..e7358738cf33 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -18,9 +18,9 @@ USE_IMAKE=	yes
 MAN1=		emiclock.1
 
 LANGRES=	resources/R6/EUC/EmiClock.ad
-LANGDIR=	${X11BASE}/lib/X11/ja_JP.eucJP/app-defaults
-LANGDIR2=	${X11BASE}/lib/X11/ja_JP.EUC/app-defaults
-EMICLOCKDIR=	${X11BASE}/lib/X11/EmiClock
+LANGDIR=	${LOCALBASE}/lib/X11/ja_JP.eucJP/app-defaults
+LANGDIR2=	${LOCALBASE}/lib/X11/ja_JP.EUC/app-defaults
+EMICLOCKDIR=	${LOCALBASE}/lib/X11/EmiClock
 PORTDOCS=	COPYRIGHT COPYRIGHT.en
 
 .include <bsd.port.pre.mk>
diff --git a/x11-clocks/gdesklets-clock/Makefile b/x11-clocks/gdesklets-clock/Makefile
index 8761fdacc93d..72a149ce72c4 100644
--- a/x11-clocks/gdesklets-clock/Makefile
+++ b/x11-clocks/gdesklets-clock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clock
 PORTVERSION=	0.32
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -20,7 +20,7 @@ RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 
 NAME=		Clock
 DATADIR=	${PREFIX}/share
diff --git a/x11-clocks/gdesklets-countdown/Makefile b/x11-clocks/gdesklets-countdown/Makefile
index 8e032390c8d0..664800e9c2b2 100644
--- a/x11-clocks/gdesklets-countdown/Makefile
+++ b/x11-clocks/gdesklets-countdown/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	countdown
 PORTVERSION=	0.8
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -19,7 +19,7 @@ COMMENT=	Countdown the remaining time until a configurable date
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_PYTHON=	yes
 
 NAME=		Countdown
diff --git a/x11-clocks/gdesklets-ebichuclock/Makefile b/x11-clocks/gdesklets-ebichuclock/Makefile
index ec65f90095cd..9ec3a4c9bdbd 100644
--- a/x11-clocks/gdesklets-ebichuclock/Makefile
+++ b/x11-clocks/gdesklets-ebichuclock/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ebichuclock
 PORTVERSION=	0.1.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://gdesklets.gnomedesktop.org/files/
 PKGNAMEPREFIX=	gdesklets-
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets \
 		${LOCALBASE}/share/gdesklets/Sensors/Clock/__init__.py:${PORTSDIR}/x11-clocks/gdesklets-clock
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 
 NAME=		ebichuclock
 DATADIR=	${PREFIX}/share
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index 7a7a4dac7a7d..7b9be9668e5a 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -19,8 +19,8 @@ LIB_DEPENDS=	glut.4:${PORTSDIR}/graphics/libglut
 USE_GL=		yes
 MAKEFILE=	makefile
 MAKE_ARGS=	CC="${CXX}" LN="${CXX}" OPT="${OPT}" \
-		INCLUDE_PATH="-I${X11BASE}/include" \
-		LIB_PATH="-L${X11BASE}/lib"
+		INCLUDE_PATH="-I${LOCALBASE}/include" \
+		LIB_PATH="-L${LOCALBASE}/lib"
 
 OPT=		-DIMAGE_PATH="\\\"${PREFIX}/lib/X11/glclock/\\\"" \
 		${CFLAGS}
diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile
index a546d77ae3de..f43aa1fc9ebb 100644
--- a/x11-clocks/mlclock/Makefile
+++ b/x11-clocks/mlclock/Makefile
@@ -21,9 +21,9 @@ PLIST_FILES=	bin/mlclock %%DATADIR%%/mlclockrc %%DATADIR%%/mlclockrc-kanji
 PLIST_DIRS=	%%DATADIR%%
 
 do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -I${X11BASE}/include \
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -I${LOCALBASE}/include \
 		-DRCFILE=\".mlclockrc\" mlclock.c -o mlclock \
-		-L${X11BASE}/lib -lX11
+		-L${LOCALBASE}/lib -lX11
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mlclock ${PREFIX}/bin
diff --git a/x11-clocks/osdclock/Makefile b/x11-clocks/osdclock/Makefile
index f7f405517889..d1fc0b3e0eb9 100644
--- a/x11-clocks/osdclock/Makefile
+++ b/x11-clocks/osdclock/Makefile
@@ -20,8 +20,8 @@ COMMENT=	Small clock which uses libxosd to render text to the root window
 LIB_DEPENDS=	xosd.4:${PORTSDIR}/misc/xosd
 
 USE_GCC=	3.4
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${X11BASE}/lib ${PTHREAD_LIBS}" \
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		PREFIX="${PREFIX}"
 
 PLIST_FILES=	bin/osd_clock
diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile
index f21e3a37f054..2d29e29ed90a 100644
--- a/x11-clocks/pclock/Makefile
+++ b/x11-clocks/pclock/Makefile
@@ -19,8 +19,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.orig/src
 
 USE_XORG=	x11 xau xdmcp xext xpm
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" OBJS="Main.o Graphics.o" \
-		INCDIR="-I. -I${X11BASE}/include ${CPPFLAGS}" \
-		LIBDIR="-L${X11BASE}/lib ${LDFLAGS}"
+		INCDIR="-I. -I${LOCALBASE}/include ${CPPFLAGS}" \
+		LIBDIR="-L${LOCALBASE}/lib ${LDFLAGS}"
 
 post-extract:
 	cd ${WRKSRC} && ${RM} -f getopt*
diff --git a/x11-clocks/washerdryer/files/patch-Makefile b/x11-clocks/washerdryer/files/patch-Makefile
index 0acc494f0165..dfee17e0e23b 100644
--- a/x11-clocks/washerdryer/files/patch-Makefile
+++ b/x11-clocks/washerdryer/files/patch-Makefile
@@ -4,7 +4,7 @@
 -LIBDIR = -L/usr/X11R6/lib -L/usr/lib -L/opt/gnome/lib
 -LIBS   = -lXpm -lXext -lX11 -lm  -lgtk -lgdk -rdynamic -lgmodule -lglib -ldl 
 -CFLAGS = -I/usr/X11R6/include -I/usr/lib/glib/include -I/opt/gnome/include/gtk-1.2 -I/opt/gnome/include/glib-1.2 -I/opt/gnome/lib/glib/include
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
 +LIBS   = `${GTK_CONFIG} --libs` -lXpm
 +CFLAGS += `${GTK_CONFIG} --cflags`
  OBJS =	washerDryer.o \
diff --git a/x11-clocks/wmbday/Makefile b/x11-clocks/wmbday/Makefile
index a3fec729962a..e67cf4f2a2bc 100644
--- a/x11-clocks/wmbday/Makefile
+++ b/x11-clocks/wmbday/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://buzzinhornetz.ath.cx/wmbday/files/
 MAINTAINER=	uspoerlein@gmail.com
 COMMENT=	Window Maker dock app that will remind you of birthdays
 
-BUILD_DEPENDS=	${X11BASE}/bin/xmessage:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	xmessage:${PORTSDIR}/x11/xmessage
 
 HAS_CONFIGURE=	yes
 MAKEFILE=	BSDmakefile
diff --git a/x11-clocks/wmbinclock/Makefile b/x11-clocks/wmbinclock/Makefile
index 5421031746a3..4d1a38d57e2f 100644
--- a/x11-clocks/wmbinclock/Makefile
+++ b/x11-clocks/wmbinclock/Makefile
@@ -21,7 +21,7 @@ USE_XORG=	xpm
 post-patch:
 	@${REINPLACE_CMD} -e 's|#include <values.h>||' ${WRKSRC}/wmBinClock.c
 	@${REINPLACE_CMD} -e 's|^CC.*=|CC ?=|' -e 's|^CFLAGS.*=|CFLAGS +=|' \
-		-e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile
+		-e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmBinClock ${PREFIX}/bin
diff --git a/x11-clocks/wmblueclock/files/patch-Makefile b/x11-clocks/wmblueclock/files/patch-Makefile
index a15735ee0605..001c63aa699c 100644
--- a/x11-clocks/wmblueclock/files/patch-Makefile
+++ b/x11-clocks/wmblueclock/files/patch-Makefile
@@ -10,8 +10,8 @@
 -# the Free Software Foundation; either version 2 of the License, or
 -# (at your option) any later version.
 +CC ?=	cc
-+LDIR =	-L${X11BASE}/lib
-+IDIR =	-I${X11BASE}/include
++LDIR =	-L${LOCALBASE}/lib
++IDIR =	-I${LOCALBASE}/include
  
 -# This program is distributed in the hope that it will be useful,
 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/x11-clocks/wmcalclock/files/patch-aa b/x11-clocks/wmcalclock/files/patch-aa
index a028f58e2fd1..da2526f3ff77 100644
--- a/x11-clocks/wmcalclock/files/patch-aa
+++ b/x11-clocks/wmcalclock/files/patch-aa
@@ -8,9 +8,9 @@
 -LIBDIR = -L/usr/X11R6/lib
 +CC     ?= gcc
 +CFLAGS ?= -O2
-+INCDIR = -I${X11BASE}/include
++INCDIR = -I${LOCALBASE}/include
 +DESTDIR= ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
  
  # for Linux
  LIBS   = -lXpm -lX11 -lXext
diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index 33ffbfe279e3..67287e5f3373 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dockable clock applet for Window Maker
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		wmclock.1
 PLIST_FILES=	bin/wmclock
 
diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile
index 28d37cbbbc3a..a4265ac74944 100644
--- a/x11-clocks/wmdate/Makefile
+++ b/x11-clocks/wmdate/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Date app for the WindowMaker dock
 LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 PLIST_FILES=	bin/wmdate
 
diff --git a/x11-clocks/wmitime/files/patch-aa b/x11-clocks/wmitime/files/patch-aa
index 7a8b2d6f4813..ed9398b1b546 100644
--- a/x11-clocks/wmitime/files/patch-aa
+++ b/x11-clocks/wmitime/files/patch-aa
@@ -5,9 +5,9 @@
 -LIBDIR = -L/usr/X11R6/lib
 +CC ?= gcc
 +CFLAGS ?= -O2
-+INCDIR = -I${X11BASE}/include
++INCDIR = -I${LOCALBASE}/include
 +DESTDIR = ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
  LIBS   = -lXpm -lXext -lX11 -lm
 -FLAGS = -O2
  OBJS =	wmitime.o \
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index dbe703c7d648..f1c648b052ee 100644
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Time/Date applet for WindowMaker
 PLIST_FILES=	bin/wmtime
 WRKSRC=		${WRKDIR}/wmtime.app/wmtime
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 post-extract:
 	${CP} ${WRKSRC}/../Imakefile ${WRKSRC}/Imakefile
diff --git a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile b/x11-clocks/wmtimer/files/patch-wmtimer::Makefile
index af58c5b4d9ec..1da0510384d8 100644
--- a/x11-clocks/wmtimer/files/patch-wmtimer::Makefile
+++ b/x11-clocks/wmtimer/files/patch-wmtimer::Makefile
@@ -5,7 +5,7 @@
 -LIBDIR = -L/usr/X11R6/lib -L/usr/lib
 -LIBS   = -lXpm -lXext -lX11 -lpthread `pkg-config --libs gtk+-2.0`
 -CFLAGS = `pkg-config --cflags gtk+-2.0`
-+LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
 +LIBS   = -lXpm -lXext -lX11 `pkg-config --libs gtk+-2.0` ${PTHREAD_LIBS}
 +CFLAGS += `pkg-config --cflags gtk+-2.0` ${PTHREAD_CFLAGS}
  
diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile
index 527cb798e42b..bb14c6d375fc 100644
--- a/x11-clocks/wmtz/Makefile
+++ b/x11-clocks/wmtz/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmtz
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-clocks windowmaker afterstep
 MASTER_SITES=	http://www.geocities.com/jl1n/wmtz/
 
@@ -15,17 +15,16 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Dockapp that displays the time in different time zones
 
 USE_GMAKE=	yes
-MAKE_ARGS=	CC="${CC}" FLAGS="${CFLAGS} -I${X11BASE}/include" \
-		LIBDIR="-L${X11BASE}/lib"
+MAKE_ARGS=	CC="${CC}" FLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+		LIBDIR="-L${LOCALBASE}/lib"
 WRKSRC=		${WRKDIR}/${DISTNAME}/wmtz
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm x11
 MAN1=		wmtz.1
 PLIST_FILES=	bin/wmtz \
 		etc/wmtzrc.default
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/wmtz ${X11BASE}/bin/wmtz
+	@${INSTALL_PROGRAM} ${WRKSRC}/wmtz ${PREFIX}/bin/wmtz
 	@${INSTALL_MAN} ${WRKSRC}/wmtz.1 ${PREFIX}/man/man1/
 	@${ECHO} "===>   Installing wmtzrc.default in ${PREFIX}/etc."
 	@${ECHO} "===>   Copy it to ~/.wmtzrc or ${PREFIX}/etc/wmtzrc and modify it."
diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile
index 8741ae9bc1fc..9e9056933b27 100644
--- a/x11-clocks/xmms-alarm/Makefile
+++ b/x11-clocks/xmms-alarm/Makefile
@@ -27,7 +27,7 @@ PLIST_FILES=	lib/xmms/General/libalarm.so
 post-patch:
 	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/configure
 
-# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/General
+# This is to avoid libtool running ldconfig -m ${LOCALBASE}/lib/xmms/General
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/.libs/libalarm.so ${PREFIX}/lib/xmms/General
 
diff --git a/x11-clocks/xtu/Makefile b/x11-clocks/xtu/Makefile
index 6289d68619af..04957d0f439a 100644
--- a/x11-clocks/xtu/Makefile
+++ b/x11-clocks/xtu/Makefile
@@ -27,7 +27,7 @@ USE_GNOME=	imlib
 CPPFLAGS=	-DUSE_IMLIB `${IMLIB_CONFIG} --cflags`
 LDFLAGS=	`${IMLIB_CONFIG} --libs`
 .else
-USE_XPM=	yes
+USE_XORG=	x11 xpm xext
 CPPFLAGS=	-DUSE_XPM
 LDFLAGS=	-lXpm -lX11 -lXext
 .endif
diff --git a/x11-drivers/synaptics/Makefile b/x11-drivers/synaptics/Makefile
index 346439f9e97a..b78925ff05b0 100644
--- a/x11-drivers/synaptics/Makefile
+++ b/x11-drivers/synaptics/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synaptics
 PORTVERSION=	0.14.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://web.telia.com/~u89404340/touchpad/files/:synaptics
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:synaptics \
@@ -17,12 +17,9 @@ EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 MAINTAINER=	nork@FreeBSD.org
 COMMENT=	The Synaptics touchpad X driver
 
-BUILD_DEPENDS=	${X11BASE}/bin/X:${X_SERVER_PORT}
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
+USE_XORG=	xorg-server xi xproto
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -54,7 +51,7 @@ post-extract:
 .endfor
 
 pre-install:
-	${MKDIR} ${X11BASE}/lib/xorg/modules/input/
+	${MKDIR} ${LOCALBASE}/lib/xorg/modules/input/
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-drivers/synaptics/files/patch-Makefile b/x11-drivers/synaptics/files/patch-Makefile
index f57b5dba5316..58bc8c599b5d 100644
--- a/x11-drivers/synaptics/files/patch-Makefile
+++ b/x11-drivers/synaptics/files/patch-Makefile
@@ -23,7 +23,7 @@
  		-I$(SDKDIR)
  else
 -  INSTALLED_X = /usr/X11R6
-+  INSTALLED_X = ${X11BASE}
++  INSTALLED_X = ${LOCALBASE}
    INPUT_MODULE_DIR = $(DESTDIR)/$(INSTALLED_X)/$(LIBDIR)/modules/input
    SYNAPTICS_DRV = synaptics_drv.o
    LDCOMBINEFLAGS = -r
@@ -31,8 +31,8 @@
    else
      SERVERSRC = $(TOP)/programs/Xserver
      ALLINCLUDES = -I. \
-+	-I${X11BASE}/include \
-+	-I${X11BASE}/include/X11 \
++	-I${LOCALBASE}/include \
++	-I${LOCALBASE}/include/X11 \
 +	-I$(SERVERSRC)/hw/xfree86 \
  	-I$(SERVERSRC)/hw/xfree86/common \
  	-I$(SERVERSRC)/hw/xfree86/os-support \
@@ -41,7 +41,7 @@
  	-I$(SERVERSRC)/include \
  	-I$(TOP)/include
 -    X_INCLUDES_ROOT = $(TOP)
-+    X_INCLUDES_ROOT = $(X11BASE)
++    X_INCLUDES_ROOT = $(LOCALBASE)
    endif
  endif
  
diff --git a/x11-fm/evidence/Makefile b/x11-fm/evidence/Makefile
index e32c65c48e3c..ce2b7003f9e4 100644
--- a/x11-fm/evidence/Makefile
+++ b/x11-fm/evidence/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	evidence
 PORTVERSION=	0.9.8
 PORTREVISION=	9
 CATEGORIES=	x11-fm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	freebsd@troback.com
 COMMENT=	Enlightened file-manager
@@ -40,8 +39,8 @@ CONFIGURE_ARGS=	--disable-dbus \
 		--disable-thumbnailer-avi \
 		--disable-thumbnailer-mpeg3 \
 		--enable-plugin-ttf
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude */CVS/*
 
diff --git a/x11-fm/ezfm/files/patch-aa b/x11-fm/ezfm/files/patch-aa
index 7f0f349483d8..80b9cd838d85 100644
--- a/x11-fm/ezfm/files/patch-aa
+++ b/x11-fm/ezfm/files/patch-aa
@@ -18,14 +18,14 @@
  #
 -CC= gcc  -g -DLINUX -I../include
 +CC?= gcc  -g -DLINUX -I../include
-+CFLAGS+= -I$(LOCALBASE)/include -I$(X11BASE)/include
++CFLAGS+= -I$(LOCALBASE)/include
  
  #
  #----------------------------------------------------------------------------------
 -LIBS = libfile.a -L../EZWGL/lib -lEZ -L/usr/X11R6/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -lm  -lc
 -STATICLIBS = libfile.a /usr/local/lib/libEZ.a -L/usr/X11R6/lib -lX11 -lXext  -lm  -lc
-+LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -L${X11BASE}/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -lm  -lc
-+STATICLIBS = libfile.a ${LOCALBASE}/lib/libEZ.a -L${X11BASE}/lib -lX11 -lXext  -lm  -lc
++LIBS = libfile.a -L../EZWGL/lib -lEZ -L${LOCALBASE}/lib -lX11 -lXext  -ljpeg -ltiff -lpng -lz -lm  -lc
++STATICLIBS = libfile.a ${LOCALBASE}/lib/libEZ.a -L${LOCALBASE}/lib -lX11 -lXext  -lm  -lc
  
  SRC= action.c folder.c atoms.c clientMessage.c main.c icons.c items.c finfo.c \
       signal.c info.c infoBtn.c printer.c misc.c mbtnFile.c mbtnView.c mbtnHelp.c popup.c\
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index b3315092f465..08bdfc5d2d15 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Filemanager with FTP capabilities. Uses Tcl/Tk
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 MAKEFILE=	Makefile.freebsd_gcc
-MAKE_ENV+=	X11BASE=${X11BASE}
+MAKE_ENV+=	LOCALBASE=${LOCALBASE}
 
 pre-build:
 #	@ ${RM} ${WRKSRC}/ext.so
diff --git a/x11-fm/filerunner/files/patch-aa b/x11-fm/filerunner/files/patch-aa
index c99e323fd747..f83d3e2d1b24 100644
--- a/x11-fm/filerunner/files/patch-aa
+++ b/x11-fm/filerunner/files/patch-aa
@@ -8,7 +8,7 @@
 -X11INC = /usr/X11/include
 +TCLINC = ${PREFIX}/include/tcl8.4
 +TKINC   = ${PREFIX}/include/tk8.4
-+X11INC = ${X11BASE}/include
++X11INC = ${LOCALBASE}/include
  
 -CFLAGS = -Wall -fPIC -O3 -I$(TCLINC) -I$(TKINC) -I$(X11INC)
 +CFLAGS += -Wall -fPIC -I$(TCLINC) -I$(TKINC) -I$(X11INC)
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile
index 6dfecb21ce53..7402bdef0eb0 100644
--- a/x11-fm/fsv/Makefile
+++ b/x11-fm/fsv/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	fsv
 PORTVERSION=	0.9
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	3D filesystem visualizer
@@ -18,10 +17,10 @@ COMMENT=	3D filesystem visualizer
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
 USE_GETTEXT=	yes
-USE_GL=		yes
+USE_GL=		gl
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-GL-prefix=${X11BASE}/lib
+CONFIGURE_ARGS=	--with-GL-prefix=${LOCALBASE}/lib
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index 348ccc0f7937..2f9f39a60c51 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-commander
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-commander/1.2
@@ -24,13 +24,11 @@ LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
 CONFLICTS=	gnome-commander-*
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomedocutils gnomehack gnomeprefix gnometarget intlhack libgnomeui
-USE_GCC=	3.4+
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 INSTALLS_OMF=	yes
 
 MAN1=		gnome-commander.1
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 1018dbc8b386..9a64bf745daa 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	nautilus
 PORTVERSION=	2.22.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +22,6 @@ INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop eel2 \
 		librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
 GNOME_DESKTOP_VERSION=2
diff --git a/x11-fm/rox-filer/Makefile b/x11-fm/rox-filer/Makefile
index f5d3837d13a1..e1011d592a9e 100644
--- a/x11-fm/rox-filer/Makefile
+++ b/x11-fm/rox-filer/Makefile
@@ -6,10 +6,9 @@
 
 PORTNAME=	rox-filer
 PORTVERSION=	2.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	rox
+MASTER_SITES=	SF/rox
 DISTNAME=	rox-filer-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -22,6 +21,7 @@ PLIST_SUB+=	LOCALBASE=${LOCALBASE}
 USE_AUTOTOOLS=	autoconf:213
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_XORG=	x11
 USE_GNOME=	pkgconfig glib20 gtk20 libxml2 gnomevfs2 pango libglade2
 HAS_CONFIGURE=	yes
 
diff --git a/x11-fm/tdfsb/Makefile b/x11-fm/tdfsb/Makefile
index e14466e6ef8a..fa0614596ad1 100644
--- a/x11-fm/tdfsb/Makefile
+++ b/x11-fm/tdfsb/Makefile
@@ -45,7 +45,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}| ; \
 			s|gcc|${CC}| ; s| -lm|| ; \
 			s|/usr/local|${LOCALBASE}|g ; \
-			s|/usr/X11R6|${X11BASE}|g ; \
+			s|/usr/X11R6|${LOCALBASE}|g ; \
 			s|-O2|${CFLAGS}|g' \
 				${WRKSRC}/${COMPILE_SCRIPT}
 
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 53150cf1c42f..0b643f867aaa 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x-files
 PORTVERSION=	2.00b1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fm tk
 MASTER_SITES=	http://users.tkk.fi/~mkivinie/X-Files/data/
 DISTNAME=	X-Files-${PORTVERSION}
@@ -20,13 +20,12 @@ RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 
 WRKSRC=		${WRKDIR}/X-Files
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
 MAN1=		X-Files.1x
 
 pre-install:
 	@tclsh8.3 ${SCRIPTDIR}/mktclIndex ${WRKSRC}
 	@${RM} -f ${WRKSRC}/xfinstall.tcl
-	@${SED} s#@X11BASE@#${X11BASE}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
+	@${SED} s#@PREFIX@#${PREFIX}# <${WRKSRC}/X-Files.tcl >${WRKSRC}/tmpfile
 	@${MV} ${WRKSRC}/tmpfile ${WRKSRC}/X-Files.tcl
 
 do-install:
@@ -36,8 +35,8 @@ do-install:
 .endfor
 	@${CHMOD} 0555 ${PREFIX}/lib/X11/X-Files/X-Files.tcl
 	@${LN} -s ${PREFIX}/lib/X11/X-Files/X-Files.tcl ${PREFIX}/bin/X-Files
-	@${MKDIR} ${X11BASE}/include/X11/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${X11BASE}/include/X11/pixmaps
-	@${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${X11BASE}/man/man1
+	@${MKDIR} ${PREFIX}/include/X11/pixmaps
+	@${INSTALL_DATA} ${WRKSRC}/X-Files.xpm ${PREFIX}/include/X11/pixmaps
+	@${INSTALL_MAN} ${WRKSRC}/X-Files.1x ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/x-files/files/patch-aa b/x11-fm/x-files/files/patch-aa
index f14dfbcd165d..a5158c732859 100644
--- a/x11-fm/x-files/files/patch-aa
+++ b/x11-fm/x-files/files/patch-aa
@@ -5,7 +5,7 @@
 +# The main file for the X-Files
 +# The next line is executed by /bin/sh, but not Tcl \
 +exec wish8.3 $0 ${1+"$@"}
-+set xf(xf_home) "@X11BASE@/lib/X11/X-Files/"
++set xf(xf_home) "@PREFIX@/lib/X11/X-Files/"
  proc MAIN {argc argv} {
  global xf xf_image env menu tk_version
  
diff --git a/x11-fm/xdiskusage/Makefile b/x11-fm/xdiskusage/Makefile
index 8127dea227f9..a32ca865a16d 100644
--- a/x11-fm/xdiskusage/Makefile
+++ b/x11-fm/xdiskusage/Makefile
@@ -34,10 +34,10 @@ BROKEN=		Does not compile
 
 do-build:
 .for i in panels xdiskusage
-	${CXX} ${CXXFLAGS} -I${X11BASE}/include -c \
+	${CXX} ${CXXFLAGS} -I${LOCALBASE}/include -c \
 		${WRKSRC}/${i}.C -o ${WRKSRC}/${i}.o
 .endfor
-	${CXX} ${CXXFLAGS} -L${X11BASE}/lib -o \
+	${CXX} ${CXXFLAGS} -L${LOCALBASE}/lib -o \
 		${WRKSRC}/xdiskusage ${WRKSRC}/panels.o \
 		${WRKSRC}/xdiskusage.o -lfltk -lm -lXext -lX11 ${LDFLAGS}
 
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index 03b2c65eb686..2a75e1058cc1 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -17,7 +17,7 @@ COMMENT=	The X File Manager
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		xfm.1 xfmtype.1
 
 .include <bsd.port.mk>
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index fea15a4eb4c1..5aaa11daa775 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xnc
 PORTVERSION=	5.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	http://www.xnc.dubna.su/src-5/
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@@ -28,8 +28,8 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
+USE_XORG=	x11 xext xt
 CONFIGURE_ARGS+=--with-pty=BSD --with-libintl-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/x11-fm/xplore/Makefile b/x11-fm/xplore/Makefile
index da23d26a68d5..a5f365e06779 100644
--- a/x11-fm/xplore/Makefile
+++ b/x11-fm/xplore/Makefile
@@ -16,7 +16,7 @@ COMMENT=	Yet another Motif file manager
 
 USE_IMAKE=	yes
 USE_MOTIF=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 MAN1=		xplore.1 xploretype.1
 
diff --git a/x11-fonts/arkpandora/Makefile b/x11-fonts/arkpandora/Makefile
index 535510ca68c2..b53b3173f249 100644
--- a/x11-fonts/arkpandora/Makefile
+++ b/x11-fonts/arkpandora/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	arkpandora
 PORTVERSION=	2.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.users.bigpond.net.au/gavindi/
 DISTNAME=	ttf-${PORTNAME}-${PORTVERSION}
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
 		ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 
@@ -33,7 +33,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-TTMKFDIR_CMD?=	${X11BASE}/bin/ttmkfdir
+TTMKFDIR_CMD?=	${LOCALBASE}/bin/ttmkfdir
 
 .SILENT:
 
@@ -75,7 +75,7 @@ install-conf:
 
 post-install:
 	${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}
diff --git a/x11-fonts/arkpandora/pkg-plist b/x11-fonts/arkpandora/pkg-plist
index 4bf58492e170..6f92b28fc224 100644
--- a/x11-fonts/arkpandora/pkg-plist
+++ b/x11-fonts/arkpandora/pkg-plist
@@ -20,4 +20,4 @@ etc/fonts/local.conf.arkpandora
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.scale
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
diff --git a/x11-fonts/artwiz-aleczapka-de/Makefile b/x11-fonts/artwiz-aleczapka-de/Makefile
index 6ba14bff2dbe..21431acaf89b 100644
--- a/x11-fonts/artwiz-aleczapka-de/Makefile
+++ b/x11-fonts/artwiz-aleczapka-de/Makefile
@@ -8,7 +8,7 @@ PORTNAME=		artwiz-aleczapka-de
 PORTVERSION=		1.3
 PORTREVISION=	2
 CATEGORIES=		x11-fonts
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=		SF
 MASTER_SITE_SUBDIR=	artwizaleczapka
 
 MAINTAINER=	herbert.skuhra@gmx.at
@@ -21,7 +21,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 FONTS=	anorexia.de aqui.de cure.de drift.de edges.de fkp.de gelly.de \
 	glisp-bold.de glisp.de kates.de lime.de mints-mild.de \
 	mints-strong.de nu.de smoothansi.de snap.de
-FONTDIR=	${X11BASE}/lib/X11/fonts/${PORTNAME}/
+FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
 FILES=	${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias \
 	${WRKSRC}/fonts.dir
 
@@ -32,7 +32,7 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR}
 
 post-install:
-	@${SED} 's|$${X11BASE}|${X11BASE}|g' \
+	@${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \
 		${PKGDIR}/pkg-message >${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-fonts/artwiz-aleczapka-de/pkg-message b/x11-fonts/artwiz-aleczapka-de/pkg-message
index 0831ae036e32..11bfafeb896f 100644
--- a/x11-fonts/artwiz-aleczapka-de/pkg-message
+++ b/x11-fonts/artwiz-aleczapka-de/pkg-message
@@ -6,11 +6,11 @@
 
  Add the following line to the "Files" section and restart XFree86.
 
- FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-de"
+ FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de"
 
  Additionally you have to do:
  
- # cd ${X11BASE}/lib/X11/fonts/artwiz-aleczapka-de
+ # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-de
  # fc-cache -v .  
 
 ------------------------------------------------------------------
diff --git a/x11-fonts/artwiz-aleczapka-se/Makefile b/x11-fonts/artwiz-aleczapka-se/Makefile
index 442a4d545f3b..cdec317b8962 100644
--- a/x11-fonts/artwiz-aleczapka-se/Makefile
+++ b/x11-fonts/artwiz-aleczapka-se/Makefile
@@ -8,7 +8,7 @@ PORTNAME=		artwiz-aleczapka-se
 PORTVERSION=		1.3
 PORTREVISION=	2
 CATEGORIES=		x11-fonts
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=		SF
 MASTER_SITE_SUBDIR=	artwizaleczapka
 
 MAINTAINER=	herbert.skuhra@gmx.at
@@ -21,7 +21,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 FONTS=	anorexia.se aqui.se cure.se drift.se edges.se fkp.se gelly.se \
 	glisp-bold.se glisp.se kates.se lime.se mints-mild.se \
 	mints-strong.se nu.se smoothansi.se snap.se
-FONTDIR=	${X11BASE}/lib/X11/fonts/${PORTNAME}/
+FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
 FILES=	${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias ${WRKSRC}/fonts.dir
 
 .include <bsd.port.pre.mk>
@@ -31,7 +31,7 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR}
 
 post-install:
-	@${SED} 's|$${X11BASE}|${X11BASE}|g' \
+	@${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \
 		${PKGDIR}/pkg-message >${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-fonts/artwiz-aleczapka-se/pkg-message b/x11-fonts/artwiz-aleczapka-se/pkg-message
index a8709505d38e..c4cd0b845dfb 100644
--- a/x11-fonts/artwiz-aleczapka-se/pkg-message
+++ b/x11-fonts/artwiz-aleczapka-se/pkg-message
@@ -6,11 +6,11 @@
 
  Add the following line to the "Files" section and restart XFree86.
 
- FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-se"
+ FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se"
 
  Additionally you have to do:
  
- # cd ${X11BASE}/lib/X11/fonts/artwiz-aleczapka-se
+ # cd ${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-se
  # fc-cache -v .  
 
 ------------------------------------------------------------------
diff --git a/x11-fonts/artwiz-aleczapka/Makefile b/x11-fonts/artwiz-aleczapka/Makefile
index 1bf4f134a5db..e66bf659f1b4 100644
--- a/x11-fonts/artwiz-aleczapka/Makefile
+++ b/x11-fonts/artwiz-aleczapka/Makefile
@@ -22,7 +22,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 FONTS=	anorexia aqui cure cursor drift edges fkp gelly \
 	glisp-bold glisp kates lime mints-mild mints-strong \
 	nu smoothansi snap
-FONTDIR=	${X11BASE}/lib/X11/fonts/${PORTNAME}/
+FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
 FILES=	${FONTS:S,$,.pcf,} ${WRKSRC}/fonts.alias \
 	${WRKSRC}/fonts.cache-1 ${WRKSRC}/fonts.dir
 
@@ -33,7 +33,7 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR}
 
 post-install:
-	@${SED} 's|$${X11BASE}|${X11BASE}|g' \
+	@${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \
 		${PKGDIR}/pkg-message >${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-fonts/artwiz-aleczapka/pkg-message b/x11-fonts/artwiz-aleczapka/pkg-message
index 6ce65b03252c..4154e64f29fa 100644
--- a/x11-fonts/artwiz-aleczapka/pkg-message
+++ b/x11-fonts/artwiz-aleczapka/pkg-message
@@ -6,6 +6,6 @@
 
  Add the following line to the "Files" section and restart XFree86.
 
- FontPath "${X11BASE}/lib/X11/fonts/artwiz-aleczapka-en"
+ FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-aleczapka-en"
 
 ------------------------------------------------------------------
diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile
index 92bf0d329912..908ae2a99567 100644
--- a/x11-fonts/artwiz-fonts/Makefile
+++ b/x11-fonts/artwiz-fonts/Makefile
@@ -23,7 +23,7 @@ WRKSRC=		${WRKDIR}/fluxbox-${PORTNAME}
 
 FONTS=	anorexia aqui cure cursor drift edges gelly glisp-bold \
 	glisp lime mints-mild mints-strong nu snap
-FONTDIR=	${X11BASE}/lib/X11/fonts/${PORTNAME}/
+FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
 FILES=	${FONTS:S,$,.pcf.gz,} ${FILESDIR}/fonts.dir
 
 .include <bsd.port.pre.mk>
@@ -33,7 +33,7 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR}
 
 post-install:
-	@${SED} 's|$${X11BASE}|${X11BASE}|g' \
+	@${SED} 's|$${LOCALBASE}|${LOCALBASE}|g' \
 		${PKGDIR}/pkg-message >${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-fonts/artwiz-fonts/pkg-message b/x11-fonts/artwiz-fonts/pkg-message
index da47a7453c2b..e9a245118b5f 100644
--- a/x11-fonts/artwiz-fonts/pkg-message
+++ b/x11-fonts/artwiz-fonts/pkg-message
@@ -6,6 +6,6 @@
 
  Add the following line to the "Files" section and restart XFree86.
 
- FontPath "${X11BASE}/lib/X11/fonts/artwiz-fonts"
+ FontPath "${LOCALBASE}/lib/X11/fonts/artwiz-fonts"
 
 ------------------------------------------------------------------
diff --git a/x11-fonts/avifonts/Makefile b/x11-fonts/avifonts/Makefile
index c94d55dc938c..76673b2f90f8 100644
--- a/x11-fonts/avifonts/Makefile
+++ b/x11-fonts/avifonts/Makefile
@@ -33,7 +33,7 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/x11-fonts/avifonts/files/pkg-message.in b/x11-fonts/avifonts/files/pkg-message.in
index fa36fd0606a7..53eac50fc8e4 100644
--- a/x11-fonts/avifonts/files/pkg-message.in
+++ b/x11-fonts/avifonts/files/pkg-message.in
@@ -9,6 +9,6 @@ Add the following line to the "Files" section of your X configuration file:
 
 	FontPath "%%FONTSDIR%%/"
 
-Note: your X configuration file is typically %%X11BASE%%/etc/X11/XF86Config
-if you are using XFree86, and %%X11BASE%%/etc/X11/xorg.conf
+Note: your X configuration file is typically %%LOCALBASE%%/etc/X11/XF86Config
+if you are using XFree86, and %%LOCALBASE%%/etc/X11/xorg.conf
 if you are using X.Org.
diff --git a/x11-fonts/avifonts/pkg-plist b/x11-fonts/avifonts/pkg-plist
index 0bdc84fabe1c..e61897885f8b 100644
--- a/x11-fonts/avifonts/pkg-plist
+++ b/x11-fonts/avifonts/pkg-plist
@@ -17,4 +17,4 @@
 %%FONTSDIR%%/fonts.dir
 @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true
diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index 342ba0512467..1a16d07cc0c4 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bitmap-fonts
 PORTVERSION=	${BITMAP_FONTS_VER}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts elisp
 MASTER_SITES=	ftp://ftp.jpl.org/pub/elisp/bitmap/ \
 		ftp://ftp.jpl.org/pub/elisp/bitmap/snapshots/
@@ -16,7 +16,9 @@ DISTNAME=	${PORTNAME}-${BITMAP_FONTS_VER}
 MAINTAINER=	conrads@cox.net
 COMMENT=	Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 # distfile version
 BITMAP_FONTS_VER=	1.0
@@ -26,7 +28,6 @@ PKGINSTALL=	${WRKDIR}/INSTALL
 PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 
 NO_WRKSUBDIR=	yes
-USE_X_PREFIX=	yes
 
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
 
@@ -43,18 +44,18 @@ do-build:
 	done
 
 pre-install:
-	@${SETENV} PKG_PREFIX=${X11BASE} \
+	@${SETENV} PKG_PREFIX=${LOCALBASE} \
 		${SH} ${PKGREQ} ${PKGNAME} INSTALL
 
 do-install:
 	@(cd ${WRKSRC}; \
 	    for i in ${BITMAP_FONTS_SIZE} ; do \
-	        ${INSTALL_DATA} bitmap$${i}.pcf.gz ${X11BASE}/${FONTSDIR} ; \
+	        ${INSTALL_DATA} bitmap$${i}.pcf.gz ${LOCALBASE}/${FONTSDIR} ; \
 	    done ; \
 	)
 
 post-install:
-	@${SETENV} PKG_PREFIX=${X11BASE} \
+	@${SETENV} PKG_PREFIX=${LOCALBASE} \
 		${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/bitmap-fonts/pkg-descr b/x11-fonts/bitmap-fonts/pkg-descr
index a539230a445d..b66d442678d9 100644
--- a/x11-fonts/bitmap-fonts/pkg-descr
+++ b/x11-fonts/bitmap-fonts/pkg-descr
@@ -3,6 +3,6 @@ Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font.
   Bitmap font is used on Mule with bitmap-mule or Emacs20 with bitmap-emacs20.
 
   Bitmap font is installed the following directory tree:
-	${X11BASE}/lib/X11/fonts/local/
+	${LOCALBASE}/lib/X11/fonts/local/
 
 --- Porting by shige <shige@FreeBSD.org>
diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index 559ff0d0c858..68dcfea5cd8e 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -22,7 +22,6 @@ BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 NO_BUILD=	yes
 
 MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
@@ -67,7 +66,7 @@ install-docs:
 
 post-install:
 	${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}
diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist
index 2298a6be2f44..c46c0ce42257 100644
--- a/x11-fonts/bitstream-vera/pkg-plist
+++ b/x11-fonts/bitstream-vera/pkg-plist
@@ -15,4 +15,4 @@
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
diff --git a/x11-fonts/code2000/Makefile b/x11-fonts/code2000/Makefile
index 6a1161ba690d..ab137e53a8b1 100644
--- a/x11-fonts/code2000/Makefile
+++ b/x11-fonts/code2000/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	code2000
 PORTVERSION=	1.17
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://code2000.net/
 DISTFILES=	${PORTNAME:U}${EXTRACT_SUFX:U}
@@ -21,7 +22,6 @@ BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 
 RESTRICTED=	Only unmodified original package can be distributed
 
-USE_X_PREFIX=	yes
 USE_ZIP=	yes
 
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
@@ -33,9 +33,9 @@ SUB_LIST=	FONTSDIR=${FONTSDIR}
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 
-MKFONTSCL_CMD=	${X11BASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${X11BASE}/bin/mkfontdir
-FCCACHE_CMD=	${X11BASE}/bin/fc-cache -f -v
+MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
+MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
+FCCACHE_CMD=	${LOCALBASE}/bin/fc-cache -f -v
 
 post-extract: move-fonts rename-license
 
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile
index bdf91cdf176a..e5eda1711e03 100644
--- a/x11-fonts/cyr-rfx/Makefile
+++ b/x11-fonts/cyr-rfx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyr-rfx-${CYR_RFX_ENCODING}
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts ukrainian russian
 MASTER_SITES=	ftp://ftp.ptc.spbu.ru/mirror/ftp.inp.nsk.su/%SUBDIR%/ \
 		ftp://ftp.inp.nsk.su/%SUBDIR%/
@@ -17,10 +17,11 @@ EXTRACT_SUFX=	.bdfs.tgz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Cyrillic X11 bitmap fonts from CYR-RFX project
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT} \
-		mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 # See WWW for other available encodings
 CYR_RFX_ENCODING?=	koi8-o
@@ -30,11 +31,11 @@ NCPUS!=		/sbin/sysctl -n hw.ncpu 2> /dev/null || echo 1
 MAKE_ARGS+=	-j ${NCPUS}
 MAKEFILE=	${FILESDIR}/Makefile.bdf2pcf
 INST_DIR=	"lib/X11/fonts/${PORTNAME}"
-MAKE_ENV+=	INST_DIR="${X11BASE}/${INST_DIR}" MKDIR="${MKDIR}"
+MAKE_ENV+=	INST_DIR="${LOCALBASE}/${INST_DIR}" MKDIR="${MKDIR}"
 PLIST_SUB+=	INST_DIR="${INST_DIR}"
 
 post-install:
-	@${SED} -e 's,/usr/X11R6,${X11BASE},g' -e \
+	@${SED} -e 's,/usr/X11R6,${LOCALBASE},g' -e \
 		's,koi8-o,${CYR_RFX_ENCODING},g' < ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/dejavu/Makefile b/x11-fonts/dejavu/Makefile
index e31a0f9adbb9..fbe367a52a08 100644
--- a/x11-fonts/dejavu/Makefile
+++ b/x11-fonts/dejavu/Makefile
@@ -8,9 +8,9 @@
 
 PORTNAME=	dejavu
 DISTVERSION=	2.24
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-fonts-ttf-${DISTVERSION}
 
 MAINTAINER=	ahze@FreeBSD.org
@@ -19,7 +19,7 @@ COMMENT=	Bitstream Vera Fonts clone with a wider range of characters
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 NO_BUILD=	yes
 PORTDOCS=	README status.txt unicover.txt langcover.txt
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}/"
@@ -43,7 +43,7 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 	@${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index e386b6f7eb62..a179da72ec50 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	etlfonts-noncjk
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# disappeared
 DISTNAME=	non-cjk
@@ -16,13 +16,14 @@ EXTRACT_SUFX=	.tar
 MAINTAINER=	mita@jp.FreeBSD.org
 COMMENT=	X11 supplemental fonts
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	# empty
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 post-extract:
 	@${GUNZIP_CMD} ${WRKSRC}/*.gz
diff --git a/x11-fonts/etlfonts/files/patch-aa b/x11-fonts/etlfonts/files/patch-aa
index e6729548d8af..5677bfa0670a 100644
--- a/x11-fonts/etlfonts/files/patch-aa
+++ b/x11-fonts/etlfonts/files/patch-aa
@@ -11,13 +11,13 @@
 + 
 + install: .pcf_done
 + 	( \
-+ 	  if [ ! -d ${X11BASE}/lib/X11/fonts/non-cjk ] ; \
-+ 	    then mkdir -p ${X11BASE}/lib/X11/fonts/non-cjk ; \
++ 	  if [ ! -d ${LOCALBASE}/lib/X11/fonts/non-cjk ] ; \
++ 	    then mkdir -p ${LOCALBASE}/lib/X11/fonts/non-cjk ; \
 + 	  fi ; \
 + 	)
-+ 	cp *pcf* fonts.alias ${X11BASE}/lib/X11/fonts/non-cjk
++ 	cp *pcf* fonts.alias ${LOCALBASE}/lib/X11/fonts/non-cjk
 + 	( \
-+ 	  cd ${X11BASE}/lib/X11/fonts/non-cjk ; \
++ 	  cd ${LOCALBASE}/lib/X11/fonts/non-cjk ; \
 + 	  mkfontdir ; \
 + 	)
 + 
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 124d2641e289..70da31009d97 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -22,14 +22,13 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GMAKE=	yes
-PREFIX?=	${X11BASE}
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack gnometarget pkgconfig ltverhack
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
 		--with-expat-includes=${LOCALBASE}/include \
 		--with-expat-lib=${LOCALBASE}/lib \
-		--with-default-fonts=${X11BASE}/lib/X11/fonts \
+		--with-default-fonts=${LOCALBASE}/lib/X11/fonts \
 		--with-cache-dir=/var/db/fontconfig \
 		--without-add-fonts \
 		--disable-docs
@@ -65,7 +64,7 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
 	fi
 	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
-		s|%%X11BASE%%|${X11BASE}|' < ${FILESDIR}/pkg-install.in \
+		s|%%LOCALBASE%%|${LOCALBASE}|' < ${FILESDIR}/pkg-install.in \
 		> ${PKGINSTALL}
 .if !defined(PACKAGE_BUILDING)
 	@${LDCONFIG} -m ${PREFIX}/lib
diff --git a/x11-fonts/fonts-indic/Makefile b/x11-fonts/fonts-indic/Makefile
index 9a5c909736af..d8755742ca26 100644
--- a/x11-fonts/fonts-indic/Makefile
+++ b/x11-fonts/fonts-indic/Makefile
@@ -29,6 +29,6 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "==> Running fc-cache"
-	@${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
+	@${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fonts-te/Makefile b/x11-fonts/fonts-te/Makefile
index da809e865133..46d70f21407e 100644
--- a/x11-fonts/fonts-te/Makefile
+++ b/x11-fonts/fonts-te/Makefile
@@ -36,7 +36,7 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 	@${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/x11-fonts/fonts-te/pkg-plist b/x11-fonts/fonts-te/pkg-plist
index 9984113c98e1..bad2de32825e 100644
--- a/x11-fonts/fonts-te/pkg-plist
+++ b/x11-fonts/fonts-te/pkg-plist
@@ -2,4 +2,4 @@
 %%FONTSDIR%%/vemana.ttf
 @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec	%%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true
+@exec	%%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 0932b80cbc10..66de0bdf44e8 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gemini
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.brama.com/compute/unix/
 PKGNAMEPREFIX=	koi8-u-
@@ -18,17 +18,19 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Ukrainian KOI8 fonts for X11R6 (koi8-u)
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USE_PERL5_BUILD=yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 NO_WRKSUBDIR=	yes
 
 MAKE_ARGS+=	-j 2
 
 post-patch:
 	${REINPLACE_CMD} -e 's/\.Z/.gz/g' \
-	    -e 's|DESTDIR =.*|DESTDIR=${X11BASE}/lib/X11/fonts/koi8-u-gemini|' \
+	    -e 's|DESTDIR =.*|DESTDIR=${LOCALBASE}/lib/X11/fonts/koi8-u-gemini|' \
 	${WRKSRC}/Makefile
 
 post-install:
diff --git a/x11-fonts/geminifonts/pkg-message b/x11-fonts/geminifonts/pkg-message
index 3be200142102..0e0b305c06a5 100644
--- a/x11-fonts/geminifonts/pkg-message
+++ b/x11-fonts/geminifonts/pkg-message
@@ -1,7 +1,7 @@
 
 	For  your X-server  to use  the fonts,  you have  to add
-	the  ${X11BASE}/lib/X11/fonts/koi8-u-gemini (X11BASE is,
-	usually,  /usr/X11R6)  to  the server's  font-path.  Use
+	the  ${LOCALBASE}/lib/X11/fonts/koi8-u-gemini (LOCALBASE is,
+	usually, /usr/local)  to  the server's  font-path.  Use
 	``xset fp+''  to do this  for the current  X-session and
 	consult  your  X-server's  documentation  to  make  this
 	permanent.
diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile
index 6f36916866d0..fa858d7b086d 100644
--- a/x11-fonts/gentium-basic/Makefile
+++ b/x11-fonts/gentium-basic/Makefile
@@ -70,7 +70,7 @@ install-docs:
 
 post-install:
 	${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSTGT}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSTGT}
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}
diff --git a/x11-fonts/gentium-basic/files/pkg-message.in b/x11-fonts/gentium-basic/files/pkg-message.in
index f5ad2494becc..8a90340f04e5 100644
--- a/x11-fonts/gentium-basic/files/pkg-message.in
+++ b/x11-fonts/gentium-basic/files/pkg-message.in
@@ -1,7 +1,7 @@
 IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
 before using.  The copyright can be found at
 
-	%%PREFIX%%/%%FONTSDIR%%/OFL
+	%%LOCALBASE%%/%%FONTSDIR%%/OFL
 
 To use these fonts, follow the instructions below.
 
@@ -12,4 +12,4 @@ line to the "Modules" section of xorg.conf:
 
 Add the following line to the "Files" section of xorg.conf:
 
-	FontPath "%%PREFIX%%/%%FONTSDIR%%/"
+	FontPath "%%LOCALBASE%%/%%FONTSDIR%%/"
diff --git a/x11-fonts/gentium-basic/pkg-plist b/x11-fonts/gentium-basic/pkg-plist
index 5c0137f1186e..70513d3a0b94 100644
--- a/x11-fonts/gentium-basic/pkg-plist
+++ b/x11-fonts/gentium-basic/pkg-plist
@@ -16,5 +16,5 @@ etc/fonts/conf.d/%%FONTNAME%%.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
 @dirrmtry etc/fonts/conf.d
diff --git a/x11-fonts/gentium/Makefile b/x11-fonts/gentium/Makefile
index 6f36916866d0..fa858d7b086d 100644
--- a/x11-fonts/gentium/Makefile
+++ b/x11-fonts/gentium/Makefile
@@ -70,7 +70,7 @@ install-docs:
 
 post-install:
 	${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSTGT}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSTGT}
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}
diff --git a/x11-fonts/gentium/files/pkg-message.in b/x11-fonts/gentium/files/pkg-message.in
index f5ad2494becc..8a90340f04e5 100644
--- a/x11-fonts/gentium/files/pkg-message.in
+++ b/x11-fonts/gentium/files/pkg-message.in
@@ -1,7 +1,7 @@
 IMPORTANT - READ CAREFULLY: Please read the COPYRIGHT included with these fonts
 before using.  The copyright can be found at
 
-	%%PREFIX%%/%%FONTSDIR%%/OFL
+	%%LOCALBASE%%/%%FONTSDIR%%/OFL
 
 To use these fonts, follow the instructions below.
 
@@ -12,4 +12,4 @@ line to the "Modules" section of xorg.conf:
 
 Add the following line to the "Files" section of xorg.conf:
 
-	FontPath "%%PREFIX%%/%%FONTSDIR%%/"
+	FontPath "%%LOCALBASE%%/%%FONTSDIR%%/"
diff --git a/x11-fonts/gentium/pkg-plist b/x11-fonts/gentium/pkg-plist
index 5c0137f1186e..70513d3a0b94 100644
--- a/x11-fonts/gentium/pkg-plist
+++ b/x11-fonts/gentium/pkg-plist
@@ -16,5 +16,5 @@ etc/fonts/conf.d/%%FONTNAME%%.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
 @dirrmtry etc/fonts/conf.d
diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile
index fbb461bfdcb9..680b2f9e3f4e 100644
--- a/x11-fonts/getbdf/Makefile
+++ b/x11-fonts/getbdf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	getbdf
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.netsw.org/x11/tools/internal/
 DISTNAME=	${PORTNAME}
@@ -18,7 +18,7 @@ COMMENT=	Convert any X server font to .bdf format
 
 PLIST_FILES=	bin/getbdf
 USE_PERL5_BUILD=yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 NO_WRKSUBDIR=	yes
 ALL_TARGET=	getbdf
 
diff --git a/x11-fonts/getbdf/files/patch-aa b/x11-fonts/getbdf/files/patch-aa
index f02f0a6b4f56..3c534f9d5464 100644
--- a/x11-fonts/getbdf/files/patch-aa
+++ b/x11-fonts/getbdf/files/patch-aa
@@ -27,11 +27,11 @@
 --- 1,10 ----
   OBJS=           getbdf.o Xargs.o open_display.o
   
-! CFLAGS+=        -I. -I${X11BASE}/include
+! CFLAGS+=        -I. -I${LOCALBASE}/include
   
   
   getbdf:         $(OBJS)
-! 		cc $(CFLAGS) $(OBJS) -o getbdf -L${X11BASE}/lib -lX11 -lm
+! 		cc $(CFLAGS) $(OBJS) -o getbdf -L${LOCALBASE}/lib -lX11 -lm
   
   clean:
   	               rm -f $(OBJS) getbdf
diff --git a/x11-fonts/gnome-font-sampler/Makefile b/x11-fonts/gnome-font-sampler/Makefile
index 78de511bc13e..90dfdf13c21a 100644
--- a/x11-fonts/gnome-font-sampler/Makefile
+++ b/x11-fonts/gnome-font-sampler/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-font-sampler
 PORTVERSION=	0.4
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://linuxadvocate.org/projects/gfontsampler/downloads/
 DISTNAME=	gfontsampler-${PORTVERSION}
@@ -15,8 +15,7 @@ DISTNAME=	gfontsampler-${PORTVERSION}
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	A program for viewing several fonts at once
 
-USE_X_PREFIX=	yes
-USE_GCC=	3.4+
+USE_XORG=	x11
 USE_GNOME=	libgnomeui gnomeprefix
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index 2a6641b2530f..9dc729ec0b2d 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	intlfonts
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	intlfonts
@@ -15,11 +15,12 @@ MASTER_SITE_SUBDIR=	intlfonts
 MAINTAINER=	conrads@cox.net
 COMMENT=	Free X11 fonts for all characters that Emacs can handle
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
-		type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS=	type1inst:${PORTSDIR}/x11-fonts/p5-type1inst
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 PLIST_SUB=	FONTSDIR=${FONTSDIR} T1_FONTSDIR=${T1_FONTSDIR} \
 		TT_FONTSDIR=${TT_FONTSDIR} DOCDIR=${DOCDIR}
 
diff --git a/x11-fonts/jmk-x11-fonts/Makefile b/x11-fonts/jmk-x11-fonts/Makefile
index f766a8043341..0e636b496097 100644
--- a/x11-fonts/jmk-x11-fonts/Makefile
+++ b/x11-fonts/jmk-x11-fonts/Makefile
@@ -7,14 +7,16 @@
 
 PORTNAME=	jmk-x11-fonts
 PORTVERSION=	3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.jmknoble.net/fonts/
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Jim Knoble's font package for X
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USE_IMAKE=	yes
 
diff --git a/x11-fonts/junicode/Makefile b/x11-fonts/junicode/Makefile
index 96f7df57b6be..599fc323f19a 100644
--- a/x11-fonts/junicode/Makefile
+++ b/x11-fonts/junicode/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	junicode
 DISTVERSION=	0-6-12
 PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	gurkan@phys.ethz.ch
 COMMENT=	Unicode font for medievalists (Latin, IPA and Runic)
@@ -40,7 +39,7 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/junicode/pkg-plist b/x11-fonts/junicode/pkg-plist
index 0c123b225125..4924ba2e6e9d 100644
--- a/x11-fonts/junicode/pkg-plist
+++ b/x11-fonts/junicode/pkg-plist
@@ -2,6 +2,6 @@
 %%FONTSDIR%%/Junicode-BoldItalic.ttf
 %%FONTSDIR%%/Junicode-Italic.ttf
 %%FONTSDIR%%/Junicode-Regular.ttf
-@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
diff --git a/x11-fonts/lfpfonts-fix/Makefile b/x11-fonts/lfpfonts-fix/Makefile
index 75c90d806bf7..880675c9efea 100644
--- a/x11-fonts/lfpfonts-fix/Makefile
+++ b/x11-fonts/lfpfonts-fix/Makefile
@@ -7,21 +7,22 @@
 
 PORTNAME=	lfpfonts-fix
 PORTVERSION=	0.82
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	xfonts
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Fixed width fonts from the Linux Font Project
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 WRKSRC=		${WRKDIR}/lfpfonts-fix
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-fix
diff --git a/x11-fonts/lfpfonts-var/Makefile b/x11-fonts/lfpfonts-var/Makefile
index 8194330500f3..359d5e01502c 100644
--- a/x11-fonts/lfpfonts-var/Makefile
+++ b/x11-fonts/lfpfonts-var/Makefile
@@ -7,21 +7,23 @@
 
 PORTNAME=	lfpfonts-var
 PORTVERSION=	0.83
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	xfonts
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Variable width fonts from the Linux Font Project
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 WRKSRC=		${WRKDIR}/lfpfonts-var
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 do-install:
 	@${MKDIR} ${PREFIX}/lib/X11/fonts/lfpfonts-var
diff --git a/x11-fonts/liberation-fonts-ttf/Makefile b/x11-fonts/liberation-fonts-ttf/Makefile
index c0f4ed74bdac..a9a81b87efb3 100644
--- a/x11-fonts/liberation-fonts-ttf/Makefile
+++ b/x11-fonts/liberation-fonts-ttf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	liberation-fonts-ttf
 PORTVERSION=	3
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	https://www.redhat.com/f/fonts/
 
@@ -16,8 +17,8 @@ COMMENT=	Liberation fonts from Red Hat to replace MS TTF fonts
 BUILD_DEPENDS=	mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale	\
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/liberation-fonts-0.2
+USE_XORG=	x11
 
 PLIST_SUB=	FONTDIR="${FONTDIR:S|${PREFIX}/||}"
 
@@ -29,8 +30,8 @@ FONTNAME=	Liberation
 FONTDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 INSTDAT=	License.txt fonts.dir fonts.scale
 
-MKFONTSCL_CMD=	${X11BASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${X11BASE}/bin/mkfontdir
+MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
+MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 
 do-build:
 	cd ${WRKSRC} &&	\
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile
index fd8d8c954c47..47e2a68603dd 100644
--- a/x11-fonts/linux-f10-fontconfig/Makefile
+++ b/x11-fonts/linux-f10-fontconfig/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 BRANDELF_DIRS=	usr/bin
diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile
index fd8d8c954c47..47e2a68603dd 100644
--- a/x11-fonts/linux-f8-fontconfig/Makefile
+++ b/x11-fonts/linux-f8-fontconfig/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 BRANDELF_DIRS=	usr/bin
diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile
index fd8d8c954c47..47e2a68603dd 100644
--- a/x11-fonts/linux-fontconfig/Makefile
+++ b/x11-fonts/linux-fontconfig/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 BRANDELF_DIRS=	usr/bin
diff --git a/x11-fonts/manu-gothica/Makefile b/x11-fonts/manu-gothica/Makefile
index d07a543e4c1f..2010793bdf77 100644
--- a/x11-fonts/manu-gothica/Makefile
+++ b/x11-fonts/manu-gothica/Makefile
@@ -36,7 +36,7 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
 	@${ECHO_MSG}
 	@${ECHO_MSG}
 
diff --git a/x11-fonts/mathfonts/Makefile b/x11-fonts/mathfonts/Makefile
index 3f19ba08957d..dd911da00806 100644
--- a/x11-fonts/mathfonts/Makefile
+++ b/x11-fonts/mathfonts/Makefile
@@ -35,11 +35,11 @@ PLIST_SUB+=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 FONTNAME=	${PORTNAME}
-FONTSBASE=	${X11BASE}/lib/X11/fonts
+FONTSBASE=	${LOCALBASE}/lib/X11/fonts
 FONTSDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 
-MKFONTSCL_CMD=	${X11BASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${X11BASE}/bin/mkfontdir
+MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
+MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 
 do-build:
 	cd ${WRKSRC} &&	${MKFONTSCL_CMD}
diff --git a/x11-fonts/mgopen/Makefile b/x11-fonts/mgopen/Makefile
index b1b517affbf2..ed8a9eb8b6c2 100644
--- a/x11-fonts/mgopen/Makefile
+++ b/x11-fonts/mgopen/Makefile
@@ -32,7 +32,7 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/x11-fonts/mgopen/files/pkg-message.in b/x11-fonts/mgopen/files/pkg-message.in
index fa36fd0606a7..754b5462d75d 100644
--- a/x11-fonts/mgopen/files/pkg-message.in
+++ b/x11-fonts/mgopen/files/pkg-message.in
@@ -9,6 +9,5 @@ Add the following line to the "Files" section of your X configuration file:
 
 	FontPath "%%FONTSDIR%%/"
 
-Note: your X configuration file is typically %%X11BASE%%/etc/X11/XF86Config
-if you are using XFree86, and %%X11BASE%%/etc/X11/xorg.conf
+Note: your X configuration file is typically %%LOCALBASE%%/etc/X11/xorg.conf
 if you are using X.Org.
diff --git a/x11-fonts/mgopen/pkg-plist b/x11-fonts/mgopen/pkg-plist
index 9a196e878029..1d15daa96f29 100644
--- a/x11-fonts/mgopen/pkg-plist
+++ b/x11-fonts/mgopen/pkg-plist
@@ -16,4 +16,4 @@
 %%FONTSDIR%%/MgOpenModernaRegular.ttf
 @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || /usr/bin/true
diff --git a/x11-fonts/mkbold-mkitalic/Makefile b/x11-fonts/mkbold-mkitalic/Makefile
index c2a609a588ab..e5fa20153fd4 100644
--- a/x11-fonts/mkbold-mkitalic/Makefile
+++ b/x11-fonts/mkbold-mkitalic/Makefile
@@ -14,7 +14,6 @@ MASTER_SITES=	http://hp.vector.co.jp/authors/VA013651/lib/
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	Programs to make BDF font bold/italic
 
-PREFIX?=	${X11BASE}
 CONFLICTS=	mkbold-[0-9]* mkitalic-[0-9]*
 
 PLIST_FILES=	bin/mkbold bin/mkitalic bin/mkbolditalic
diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile
index 80c46c878d9e..5ae56acafc04 100644
--- a/x11-fonts/mkbold/Makefile
+++ b/x11-fonts/mkbold/Makefile
@@ -15,7 +15,6 @@ EXTRACT_SUFX=	.bz2
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	Perl script to make BDF font bold
 
-PREFIX?=	${X11BASE}
 CONFLICTS=	mkbold-mkitalic-[0-9]*
 
 PLIST_FILES=	bin/mkbold
diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile
index ce404f9a0930..29f8c8097a1f 100644
--- a/x11-fonts/mkitalic/Makefile
+++ b/x11-fonts/mkitalic/Makefile
@@ -15,7 +15,6 @@ EXTRACT_SUFX=	.bz2
 MAINTAINER=	koma2@lovepeers.org
 COMMENT=	Perl script to make BDF font italic
 
-PREFIX?=	${X11BASE}
 CONFLICTS=	mkbold-mkitalic-[0-9]*
 
 PLIST_FILES=	bin/mkitalic
diff --git a/x11-fonts/nucleus/Makefile b/x11-fonts/nucleus/Makefile
index db393bb924cc..209c3e0a8aac 100644
--- a/x11-fonts/nucleus/Makefile
+++ b/x11-fonts/nucleus/Makefile
@@ -7,18 +7,20 @@
 
 PORTNAME=	nucleus
 PORTVERSION=	0.77
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	xfonts
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Another font package for X
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 NO_WRKSUBDIR=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 post-install:
 	@${CAT} ${DESCR}
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index 3f26fa8fa5fd..e61f46874375 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -17,8 +17,8 @@ MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	A script that helps install Postscript fonts in X Window System
 
 .if !defined(WITHOUT_X11)
-RUN_DEPENDS=	${X11BASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
-		${X11BASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
+RUN_DEPENDS=	${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 .endif
 
 USE_PERL5=	yes
diff --git a/x11-fonts/ppantsfonts/Makefile b/x11-fonts/ppantsfonts/Makefile
index 0ca6223bdedc..48443ab4f109 100644
--- a/x11-fonts/ppantsfonts/Makefile
+++ b/x11-fonts/ppantsfonts/Makefile
@@ -19,7 +19,7 @@ NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 FONTS=	moosefont terminalpants
-FONTDIR=	${X11BASE}/lib/X11/fonts/${PORTNAME}/
+FONTDIR=	${LOCALBASE}/lib/X11/fonts/${PORTNAME}/
 FILES=	${FONTS:S,$,.pcf.gz,} ${FILESDIR}/fonts.dir
 WRKSRC=	${WRKDIR}/ppants
 
@@ -33,7 +33,7 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} ${FILES} ${FONTDIR}
 
 post-install:
-	@${SED} 's,$${X11BASE},${X11BASE},g' \
+	@${SED} 's,$${LOCALBASE},${LOCALBASE},g' \
 		${PKGDIR}/pkg-message >${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11-fonts/ppantsfonts/pkg-message b/x11-fonts/ppantsfonts/pkg-message
index 20d332d831df..caac998e6a9f 100644
--- a/x11-fonts/ppantsfonts/pkg-message
+++ b/x11-fonts/ppantsfonts/pkg-message
@@ -6,6 +6,6 @@
 
  Add the following line to the "Files" section and restart XFree86.
 
- FontPath "${X11BASE}/lib/X11/fonts/ppantsfonts"
+ FontPath "${LOCALBASE}/lib/X11/fonts/ppantsfonts"
 
 ------------------------------------------------------------------
diff --git a/x11-fonts/proggy_fonts/Makefile b/x11-fonts/proggy_fonts/Makefile
index c6b67f80ab4c..ad2c1812a1e1 100644
--- a/x11-fonts/proggy_fonts/Makefile
+++ b/x11-fonts/proggy_fonts/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	proggy_fonts
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.proggyfonts.com/download/
 DISTFILES=	ProggyClean.pcf.zip ProggySquare.pcf.zip	\
@@ -19,9 +19,10 @@ DISTFILES=	ProggyClean.pcf.zip ProggySquare.pcf.zip	\
 MAINTAINER=	llwang@infor.org
 COMMENT=	The perfect monospaced bitmap programming fonts
 
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+RUN_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
diff --git a/x11-fonts/sgifonts/Makefile b/x11-fonts/sgifonts/Makefile
index 0049ecc34fed..b08c411279f1 100644
--- a/x11-fonts/sgifonts/Makefile
+++ b/x11-fonts/sgifonts/Makefile
@@ -18,7 +18,8 @@ MAINTAINER=	conrads@cox.net
 COMMENT=	Fonts from the SGI ProPack 1.4 (originally for Linux)
 
 EXTRACT_DEPENDS=	rpm2cpio.pl:${PORTSDIR}/archivers/rpm2cpio
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
+BUILD_DEPENDS=		bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+			mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
 
 PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	lib/X11/fonts/local/sgi
diff --git a/x11-fonts/suxus/Makefile b/x11-fonts/suxus/Makefile
index d6e45c34a711..b3f143303c34 100644
--- a/x11-fonts/suxus/Makefile
+++ b/x11-fonts/suxus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	suxus
 PORTVERSION=	1.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.goof.com/pcg/marc/data/
 DISTFILES=	${PORTNAME}-iso-8859-1.bdf.gz fonts.alias
@@ -16,11 +16,12 @@ DIST_SUBDIR=	suxus
 MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	An x11 font designed to be small yet easily read
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT} \
-		mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 SUB_FILES=	pkg-message
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index 28e0da00f148..31e4ad9285b5 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -29,12 +29,12 @@ post-build:
 	@${GZIP_CMD} ${WRKSRC}/*.pcf
 
 do-install:
-	@${MKDIR} ${X11BASE}/${FONTDIR}
-	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${X11BASE}/${FONTDIR}
+	@${MKDIR} ${LOCALBASE}/${FONTDIR}
+	@${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${LOCALBASE}/${FONTDIR}
 
 post-install:
-	@cd ${X11BASE}/${FONTDIR}; mkfontdir
-	@${CP} ${X11BASE}/${FONTDIR}/fonts.dir ${X11BASE}/${FONTDIR}/fonts.scale || true
-	@command fc-cache -f -v ${X11BASE}/${FONTDIR} || true
+	@cd ${LOCALBASE}/${FONTDIR}; mkfontdir
+	@${CP} ${LOCALBASE}/${FONTDIR}/fonts.dir ${LOCALBASE}/${FONTDIR}/fonts.scale || true
+	@command fc-cache -f -v ${LOCALBASE}/${FONTDIR} || true
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/texcm-ttf/Makefile b/x11-fonts/texcm-ttf/Makefile
index c7e3fa68b088..03efa8d808b7 100644
--- a/x11-fonts/texcm-ttf/Makefile
+++ b/x11-fonts/texcm-ttf/Makefile
@@ -35,8 +35,8 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 FONTNAME=	${PORTNAME}
 FONTSDIR=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 
-MKFONTSCL_CMD=	${X11BASE}/bin/mkfontscale
-MKFONTDIR_CMD=	${X11BASE}/bin/mkfontdir
+MKFONTSCL_CMD=	${LOCALBASE}/bin/mkfontscale
+MKFONTDIR_CMD=	${LOCALBASE}/bin/mkfontdir
 
 do-build:
 	cd ${WRKSRC} &&	${MKFONTSCL_CMD}
diff --git a/x11-fonts/tolkien-ttf/Makefile b/x11-fonts/tolkien-ttf/Makefile
index 802b702997e9..a901b1930528 100644
--- a/x11-fonts/tolkien-ttf/Makefile
+++ b/x11-fonts/tolkien-ttf/Makefile
@@ -33,7 +33,7 @@ do-install:
 
 post-install:
 	@${ECHO_MSG} "==> Running fc-cache"
-	@${X11BASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
+	@${LOCALBASE}/bin/fc-cache -f -v ${PREFIX}/${FONTSDIR}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index 26954b3815fb..b906e64c6145 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ttmkfdir
 PORTVERSION=	3.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts x11
 MASTER_SITES=	http://mbsd.msk.ru/dist/
@@ -20,7 +20,7 @@ LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 PLIST_FILES=	bin/ttmkfdir
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 MAKE_ENV=	LDFLAGS="${LDFLAGS}" CXXFLAGS="${CFLAGS}" CXX="${CXX}"
 
diff --git a/x11-fonts/tv-fonts/Makefile b/x11-fonts/tv-fonts/Makefile
index 07498024140c..6a29cfad2069 100644
--- a/x11-fonts/tv-fonts/Makefile
+++ b/x11-fonts/tv-fonts/Makefile
@@ -41,6 +41,6 @@ do-install:
 .endfor
 
 post-install:
-	@-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	@-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index e282f302f87b..4789dafa5188 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -43,11 +43,11 @@ EXTRACT_AFTER_ARGS=
 #
 FONTNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
-TTFONTSDIR?=	${X11BASE}/lib/X11/fonts/TrueType
+TTFONTSDIR?=	${LOCALBASE}/lib/X11/fonts/TrueType
 
 PLIST_SUB=	FONTNAME="${FONTNAME}" \
 		FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \
-		TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}"
+		TTFONTSDIR="${TTFONTSDIR:S|${LOCALBASE}/||}"
 
 SUB_LIST=	FONTSDIR="${FONTSDIR}" DOCSDIR="${DOCSDIR}"
 SUB_FILES=	pkg-message
@@ -108,7 +108,7 @@ do-install:
 #
 post-install:
 	${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v ${FONTSDIR}
+	-${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}
diff --git a/x11-fonts/webfonts/pkg-plist b/x11-fonts/webfonts/pkg-plist
index 8db024244000..8f5627afe9e6 100644
--- a/x11-fonts/webfonts/pkg-plist
+++ b/x11-fonts/webfonts/pkg-plist
@@ -37,4 +37,4 @@
 %%DOCSDIR%%/LICENSE
 @dirrm %%DOCSDIR%%
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
diff --git a/x11-fonts/wqy/Makefile b/x11-fonts/wqy/Makefile
index 32fb600dfdc8..dc6971a6dfb3 100644
--- a/x11-fonts/wqy/Makefile
+++ b/x11-fonts/wqy/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	wqy
 PORTVERSION=	0.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	x11-fonts
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+MASTER_SITES=	SF \
 		http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	wqy
 DISTNAME=	${PORTNAME}-bitmapfont-pcf-${PORTVERSION}-6
@@ -20,7 +20,7 @@ COMMENT=	A font which includes all the CJK characters covered by Unicode 4.0
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-bitmapfont
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 FONTSDIR=	lib/X11/fonts/wqy
 CONFDDIR=	etc/fonts/conf.d
 CONFAVAILDIR=	etc/fonts/conf.avail
@@ -29,8 +29,10 @@ PLIST_SUB=	FONTSDIR=${FONTSDIR} \
 		CONFDDIR=${CONFDDIR} \
 		CONFAVAILDIR=${CONFAVAILDIR}
 
-BUILD_DEPENDS+=        mkfontdir:${X_CLIENTS_PORT}
-BUILD_DEPENDS+=        fc-cache:${PORTSDIR}/x11-fonts/fontconfig
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
+		fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
 OPTIONS=	ALIAS	"Install fonts.alias" off
 
diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa
index 1ab5342c4422..751e686ceb69 100644
--- a/x11-fonts/xmbdfed/files/patch-aa
+++ b/x11-fonts/xmbdfed/files/patch-aa
@@ -64,8 +64,8 @@ $FreeBSD$
  #LIBS = -L/usr/Motif-1.2/lib32 -lXm \
  #       -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)
  
-+INCS = -I${X11BASE}/include ${FTYPE_INCS}
-+LIBS = -L${X11BASE}/lib ${MOTIFLIB} \
++INCS = -I${LOCALBASE}/include ${FTYPE_INCS}
++LIBS = -L${LOCALBASE}/lib ${MOTIFLIB} \
 +       -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext ${FTYPE_LIBS}
 +
  all: xmbdfed
diff --git a/x11-fonts/xorg-fonts-100dpi/Makefile b/x11-fonts/xorg-fonts-100dpi/Makefile
index 6f64938cc598..be413b06e564 100644
--- a/x11-fonts/xorg-fonts-100dpi/Makefile
+++ b/x11-fonts/xorg-fonts-100dpi/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${FONTDIR}/100dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-1
 CONFLICTS=	XFree86-font100dpi-*
 
 NO_BUILD=	# none
-FONTDIR=	${X11BASE}/lib/X11/fonts
+FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
diff --git a/x11-fonts/xorg-fonts-75dpi/Makefile b/x11-fonts/xorg-fonts-75dpi/Makefile
index a300aa357c4a..0981f2d82729 100644
--- a/x11-fonts/xorg-fonts-75dpi/Makefile
+++ b/x11-fonts/xorg-fonts-75dpi/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${FONTDIR}/75dpi/courB08.pcf.gz:${PORTSDIR}/x11-fonts/font-adobe-75
 CONFLICTS=	XFree86-font75dpi-*
 
 NO_BUILD=	# none
-FONTDIR=	${X11BASE}/lib/X11/fonts
+FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
diff --git a/x11-fonts/xorg-fonts-cyrillic/Makefile b/x11-fonts/xorg-fonts-cyrillic/Makefile
index 7855454e1a26..3ee0e6454351 100644
--- a/x11-fonts/xorg-fonts-cyrillic/Makefile
+++ b/x11-fonts/xorg-fonts-cyrillic/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${FONTDIR}/cyrillic/crox1c.pcf.gz:${PORTSDIR}/x11-fonts/font-cronyx
 CONFLICTS=	XFree86-fontCyrillic-*
 
 NO_BUILD=	# none
-FONTDIR=	${X11BASE}/lib/X11/fonts
+FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
diff --git a/x11-fonts/xorg-fonts-miscbitmaps/Makefile b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
index 39a8fd8f26c1..2d89072e96b7 100644
--- a/x11-fonts/xorg-fonts-miscbitmaps/Makefile
+++ b/x11-fonts/xorg-fonts-miscbitmaps/Makefile
@@ -31,7 +31,7 @@ RUN_DEPENDS=	${FONTDIR}/misc/arabic24.pcf.gz:${PORTSDIR}/x11-fonts/font-arabic-m
 CONFLICTS=	XFree86-fontDefaultBitmaps-*
 
 NO_BUILD=	# none
-FONTDIR=	${X11BASE}/lib/X11/fonts
+FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 do-install:	# empty
 
diff --git a/x11-fonts/xorg-fonts-truetype/Makefile b/x11-fonts/xorg-fonts-truetype/Makefile
index f95b4aec7dea..684022a20695 100644
--- a/x11-fonts/xorg-fonts-truetype/Makefile
+++ b/x11-fonts/xorg-fonts-truetype/Makefile
@@ -18,14 +18,12 @@ COMMENT=	X.Org TrueType fonts
 RUN_DEPENDS=	${FONTDIR}/TTF/luximb.ttf:${PORTSDIR}/x11-fonts/font-bh-ttf \
 		${FONTDIR}/OTF/SyrCOMAdiabene.otf:${PORTSDIR}/x11-fonts/font-misc-meltho \
 		${FONTDIR}/TTF/GohaTibebZemen.ttf:${PORTSDIR}/x11-fonts/font-misc-ethiopic \
-		${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/VeraIt.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-
-CONFLICTS=	XFree86-fontScalable-*
+		${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/encodings \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/VeraIt.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 
 do-install:	# empty
 
 NO_BUILD=	# none
-FONTDIR=	${X11BASE}/lib/X11/fonts
+FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts-type1/Makefile b/x11-fonts/xorg-fonts-type1/Makefile
index 3fc860e3abeb..bf10b17a3a74 100644
--- a/x11-fonts/xorg-fonts-type1/Makefile
+++ b/x11-fonts/xorg-fonts-type1/Makefile
@@ -27,6 +27,6 @@ CONFLICTS=	XFree86-fontScalable-*
 do-install:	# empty
 
 NO_BUILD=	# none
-FONTDIR=	${X11BASE}/lib/X11/fonts
+FONTDIR=	${LOCALBASE}/lib/X11/fonts
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/xorg-fonts/Makefile b/x11-fonts/xorg-fonts/Makefile
index eb3137a0bfa1..9640236c8fc2 100644
--- a/x11-fonts/xorg-fonts/Makefile
+++ b/x11-fonts/xorg-fonts/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xorg-fonts
 PORTVERSION=	7.3
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -16,7 +17,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org fonts meta-port
 
 USE_XORG=	fontutil
-PREFIX?=	${X11BASE}
 
 FONTSDIR=	${PREFIX}/lib/X11/fonts
 RUN_DEPENDS=	${FONTSDIR}/100dpi/courB08-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-100dpi \
diff --git a/x11-servers/Xfstt/Makefile b/x11-servers/Xfstt/Makefile
index 5ad3a785162c..7692b6ef8b68 100644
--- a/x11-servers/Xfstt/Makefile
+++ b/x11-servers/Xfstt/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	xfstt
 PORTVERSION=	1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://download.berlios.de/xfstt/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A TrueType font server for X11
 
-USE_X_PREFIX=	yes
+USE_XORG=	fontsproto xproto
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--localstatedir=/var --disable-nls
diff --git a/x11-servers/driglide/Makefile b/x11-servers/driglide/Makefile
index d74459512d17..db2751f94333 100644
--- a/x11-servers/driglide/Makefile
+++ b/x11-servers/driglide/Makefile
@@ -29,7 +29,7 @@ ONLY_FOR_ARCHS=	i386
 CFLAGS+=	-O
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/configure.in \
 		${WRKSRC}/h3/glide3/src/Makefile.am \
 		${WRKSRC}/h5/glide3/src/Makefile.am
diff --git a/x11-servers/mga_hal/Makefile b/x11-servers/mga_hal/Makefile
index ac3ae9917682..cf56a40d12cb 100644
--- a/x11-servers/mga_hal/Makefile
+++ b/x11-servers/mga_hal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mga_hal
 PORTVERSION=	4.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	ftp://ftp.matrox.com/pub/mga/archive/linux/%SUBDIR%/:i386,amd64
 MASTER_SITE_SUBDIR=	2006/:i386 2006/64bit/:amd64
@@ -19,7 +19,6 @@ COMMENT=	Module for additional features with X.Org/XFree86 Matrox driver
 RESTRICTED=	Matrox drivers may not be distributed.
 
 ONLY_FOR_ARCHS=	i386 amd64
-USE_X_PREFIX=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-servers/x2vnc/Makefile b/x11-servers/x2vnc/Makefile
index 7819adc010b9..6fc9d07e9655 100644
--- a/x11-servers/x2vnc/Makefile
+++ b/x11-servers/x2vnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x2vnc
 PORTVERSION=	1.72
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://fredrik.hubbe.net/x2vnc/
 DISTNAME=	${PORTNAME}-1.7.2
@@ -15,10 +15,12 @@ DISTNAME=	${PORTNAME}-1.7.2
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A program to link multiple X and VNC servers together
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
+USE_XORG=	x11 xext xrandr xxf86dga ice xinerama xrandr xrender xscrnsaver sm
 MAN1=		x2vnc.1
 PLIST_FILES=	bin/x2vnc
 
diff --git a/x11-servers/xorg-dmx/Makefile b/x11-servers/xorg-dmx/Makefile
index b8626d13751a..fadee0ad7e9c 100644
--- a/x11-servers/xorg-dmx/Makefile
+++ b/x11-servers/xorg-dmx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xorg-dmx
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-servers
 
@@ -26,7 +26,7 @@ USE_XORG=	x11 xf86driproto glproto randrproto renderproto fixesproto \
 		compositeproto trapproto recordproto resourceproto \
 		xineramaproto evieproto xkbfile xfont fontenc xkbui \
 		xxf86misc xxf86vm xaw7 xmu xpm xext xrender xfixes xi dmxproto \
-		xau dmx xtst xres pixman
+		xau dmx xtst xres pixman xtrans
 		
 CONFIGURE_ARGS=	--disable-xprint --disable-xvfb --disable-xorg --disable-xnest \
 		--enable-dmx --localstatedir=/var
diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index 0ba3f4574f53..29111a4271c8 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS=	${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
 
 CONFLICTS=	XFree86-Server-*
 
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index 64bb6924949a..0f5d45f228d7 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -20,7 +20,7 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org X server and related programs
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
-RUN_DEPENDS=	${X11BASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
+RUN_DEPENDS=	${LOCALBASE}/share/X11/xkb/rules/base.xml:${PORTSDIR}/x11/xkeyboard-config
 
 CONFLICTS=	XFree86-Server-*
 
diff --git a/x11-themes/bluecurve-themes/Makefile b/x11-themes/bluecurve-themes/Makefile
index 546a87409093..784ad9fb1cd2 100644
--- a/x11-themes/bluecurve-themes/Makefile
+++ b/x11-themes/bluecurve-themes/Makefile
@@ -28,11 +28,11 @@ DISTFILES=	# empty
 EXTRACT_ONLY=	# empty
 
 # note: gtk-/icon-/metacity- are brought in by gnome-
-RUN_DEPENDS=	${X11BASE}/lib/X11/icons/Bluecurve/cursors/X_cursor:${PORTSDIR}/x11-themes/cursor-bluecurve-theme \
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/icons/Bluecurve/cursors/X_cursor:${PORTSDIR}/x11-themes/cursor-bluecurve-theme \
 		${LOCALBASE}/share/themes/Bluecurve/index.theme:${PORTSDIR}/x11-themes/gnome-bluecurve-theme \
 		${LINUXBASE}/usr/share/themes/Bluecurve/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/linux-gtk-bluecurve-theme \
-		${X11BASE}/lib/plugins/styles/bluecurve.so:${PORTSDIR}/x11-themes/qt-bluecurve-theme \
-		${X11BASE}/share/xmms/Skins/Bluecurve-xmms.zip:${PORTSDIR}/x11-themes/xmms-bluecurve-theme
+		${LOCALBASE}/lib/plugins/styles/bluecurve.so:${PORTSDIR}/x11-themes/qt-bluecurve-theme \
+		${LOCALBASE}/share/xmms/Skins/Bluecurve-xmms.zip:${PORTSDIR}/x11-themes/xmms-bluecurve-theme
 
 NO_BUILD=	yes
 
diff --git a/x11-themes/clearlooks-metacity/Makefile b/x11-themes/clearlooks-metacity/Makefile
index 705bbfc40bd5..4736aa23f63f 100644
--- a/x11-themes/clearlooks-metacity/Makefile
+++ b/x11-themes/clearlooks-metacity/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	clearlooks-metacity
 PORTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://www.stellingwerff.com/
 #MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -21,7 +21,6 @@ CONFLICTS=	gnome-themes-2.11.9[1-9]* gnome-themes-2.*
 
 WRKSRC=		${WRKDIR}/Clearlooks/metacity-1/
 USE_GNOME=	metacity gnomeprefix
-USE_X_PREFIX=	yes
 DATADIR=	share/themes/Clearlooks/metacity-1
 NO_BUILD=	yes
 
diff --git a/x11-themes/clearlooks/Makefile b/x11-themes/clearlooks/Makefile
index a67f4e8d5866..31a2de5ce1fa 100644
--- a/x11-themes/clearlooks/Makefile
+++ b/x11-themes/clearlooks/Makefile
@@ -10,9 +10,7 @@ PORTNAME?=	clearlooks
 PORTVERSION=	0.6.2
 PORTREVISION=	6
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	clearlooks
-DISTNAME=	clearlooks-${PORTVERSION}
+MASTER_SITES=	SF
 
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT?=	GTK+ 2.x engine based on Bluecurve
@@ -22,8 +20,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 INSTALLS_ICONS=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(PORTNAME) && ${PORTNAME} == "clearlooks"
 OPTIONS+=	ANIMATION "Enable experimental animated progressbars" Off \
diff --git a/x11-themes/cursor-bluecurve-theme/Makefile b/x11-themes/cursor-bluecurve-theme/Makefile
index d0c0bd50225e..88d14ae97e0f 100644
--- a/x11-themes/cursor-bluecurve-theme/Makefile
+++ b/x11-themes/cursor-bluecurve-theme/Makefile
@@ -18,8 +18,6 @@ BROKEN=		Incorrect pkg-plist and unfetchable
 DEPRECATED=		"${BROKEN}"
 EXPIRATION_DATE=	2007-11-02
 
-PREFIX=		${X11BASE}
-
 THEMES=		Bluecurve Bluecurve-inverse LBluecurve LBluecurve-inverse
 
 .for t in ${THEMES}
@@ -45,7 +43,7 @@ do-build:
 .include "${MASTERDIR}/bsd.bluecurve.mk"
 .include <bsd.port.pre.mk>
 
-BUILD_DEPENDS+=	xcursorgen:${X_CLIENTS_PORT}	# needed by cursorthemegen
-RUN_DEPENDS+=	xcursorgen:${X_CLIENTS_PORT}	# for the lib/X11/icons directory
+BUILD_DEPENDS+=	xcursorgen:${PORTSDIR}/x11/xcursorgen	# needed by cursorthemegen
+RUN_DEPENDS+=	xcursorgen:${PORTSDIR}/x11/xcursorgen	# for the lib/X11/icons directory
 
 .include <bsd.port.post.mk>
diff --git a/x11-themes/emerald-themes/Makefile b/x11-themes/emerald-themes/Makefile
index 7c797cdeb52a..87a607bbcf9f 100644
--- a/x11-themes/emerald-themes/Makefile
+++ b/x11-themes/emerald-themes/Makefile
@@ -20,8 +20,8 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} 's|/bin/bash|${LOCALBASE}/bin/bash|' \
diff --git a/x11-themes/enlightenment-theme-BlueSteel/Makefile b/x11-themes/enlightenment-theme-BlueSteel/Makefile
index d33a89617701..ca47500a1991 100644
--- a/x11-themes/enlightenment-theme-BlueSteel/Makefile
+++ b/x11-themes/enlightenment-theme-BlueSteel/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	enlightenment-theme-BlueSteel
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
 DISTNAME=	${PORTNAME:S/enlightenment/e16/}-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A themes of enlightenment window menager
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 NO_BUILD=	yes
diff --git a/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile b/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
index 53cb60938967..0f4b6878d3fc 100644
--- a/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
+++ b/x11-themes/enlightenment-theme-BrushedMetal-Tigert/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	enlightenment-theme-BrushedMetal-Tigert
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
 DISTNAME=	e16-theme-BrushedMetal-Tigert-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A themes of enlightenment window menager
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 NO_BUILD=	yes
diff --git a/x11-themes/enlightenment-theme-Ganymede/Makefile b/x11-themes/enlightenment-theme-Ganymede/Makefile
index 6fd373832d31..8295bd2b4358 100644
--- a/x11-themes/enlightenment-theme-Ganymede/Makefile
+++ b/x11-themes/enlightenment-theme-Ganymede/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	enlightenment-theme-Ganymede
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
 DISTNAME=	${PORTNAME:S/enlightenment/e16/}-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A themes of enlightenment window menager
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 NO_BUILD=	yes
diff --git a/x11-themes/enlightenment-theme-ShinyMetal/Makefile b/x11-themes/enlightenment-theme-ShinyMetal/Makefile
index 21b493a9ad45..139eaff33ef8 100644
--- a/x11-themes/enlightenment-theme-ShinyMetal/Makefile
+++ b/x11-themes/enlightenment-theme-ShinyMetal/Makefile
@@ -7,18 +7,18 @@
 
 PORTNAME=	enlightenment-theme-ShinyMetal
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	enlightenment
 DISTNAME=	${PORTNAME:S/enlightenment/e16/}-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A themes of enlightenment window menager
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
 NO_BUILD=	yes
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index f694f8db9276..f1332d668506 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-engines
 PORTVERSION=	0.12
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-themes
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk-engines/0.12
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	sources/gtk-engines/0.12
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Theme engine for gtk+ toolkits
 
-USE_XLIB=	yes
 USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 
diff --git a/x11-themes/gtk-industrial-theme/files/Makefile-gtk1 b/x11-themes/gtk-industrial-theme/files/Makefile-gtk1
index af33131c265a..74b111eb1b9b 100644
--- a/x11-themes/gtk-industrial-theme/files/Makefile-gtk1
+++ b/x11-themes/gtk-industrial-theme/files/Makefile-gtk1
@@ -8,7 +8,7 @@ GTK_CFLAGS = `$(GTK_CONFIG) --cflags`
 GTK_LIBS = `$(GTK_CONFIG) --libs`
 LN_S = ln -s
 INCLUDES = $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS)
-XLIBDIR=$(X11BASE)/lib
+XLIBDIR=$(LOCALBASE)/lib
 LOCALLIBDIR=$(LOCALBASE)/lib
 enginedir = $(XLIBDIR)/gtk/themes/engines
 engine_LTLIBRARIES = libindustrial.la
diff --git a/x11-themes/phase/Makefile b/x11-themes/phase/Makefile
index e3b53d3c583c..a1d302ce72e7 100644
--- a/x11-themes/phase/Makefile
+++ b/x11-themes/phase/Makefile
@@ -20,7 +20,7 @@ USE_KDEBASE_VER=3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
 .include <bsd.port.mk>
diff --git a/x11-themes/polymer/Makefile b/x11-themes/polymer/Makefile
index 900eff4f4446..4910f8a1c404 100644
--- a/x11-themes/polymer/Makefile
+++ b/x11-themes/polymer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	polymer
 PORTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-themes
 MASTER_SITES=	http://static.int.pl/~mig21/dev/releases/polymer/ \
 		${MASTER_SITE_LOCAL}
@@ -18,11 +18,10 @@ COMMENT=	Qt port of Plastik KDE theme
 
 BUILD_DEPENDS=	qmake:${PORTSDIR}/devel/qmake
 
-USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoheader:261
 USE_QT_VER=	3
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAKE_ARGS+=	QTDIR=${QT_PREFIX} \
 		QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
diff --git a/x11-themes/qinx/Makefile b/x11-themes/qinx/Makefile
index 5736888d3f27..39a2c43edb06 100644
--- a/x11-themes/qinx/Makefile
+++ b/x11-themes/qinx/Makefile
@@ -18,7 +18,7 @@ USE_KDEBASE_VER=3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
 .include <bsd.port.mk>
diff --git a/x11-themes/qt-bluecurve-theme/Makefile b/x11-themes/qt-bluecurve-theme/Makefile
index 946b1f2016cc..a24a3101e874 100644
--- a/x11-themes/qt-bluecurve-theme/Makefile
+++ b/x11-themes/qt-bluecurve-theme/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qt-bluecurve-theme
-
+PORTREVISION=	1
 COMMENT=	The Bluecurve QT theme
 
 MASTERDIR=	${.CURDIR}/../bluecurve-themes
@@ -14,16 +14,15 @@ MASTERDIR=	${.CURDIR}/../bluecurve-themes
 USE_QT_VER=	3
 BUILD_WRKSRC=	${WRKSRC}/art/qt/Bluecurve
 
-QT_CFLAGS=	-I${X11BASE}/include -DQT_THREAD_SUPPORT ${PTHREAD_CFLAGS}
-QT_LIBS=	-L${X11BASE}/lib -lqt-mt ${PTHREAD_LIBS}
-USE_X_PREFIX=	yes
+QT_CFLAGS=	-I${LOCALBASE}/include -DQT_THREAD_SUPPORT ${PTHREAD_CFLAGS}
+QT_LIBS=	-L${LOCALBASE}/lib -lqt-mt ${PTHREAD_LIBS}
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|GtkStyle|0|' ${BUILD_WRKSRC}/bluecurve.cpp
 	@${REINPLACE_CMD} -e \
-		's|^\(libraryPath\)=.*|\1=${X11BASE}/lib/plugins|' \
+		's|^\(libraryPath\)=.*|\1=${LOCALBASE}/lib/plugins|' \
 		${WRKSRC}/art/qt/qtrc
 
 do-build:
diff --git a/x11-themes/sapphire-themes/Makefile b/x11-themes/sapphire-themes/Makefile
index 4d0618a155af..8d065296ec1d 100644
--- a/x11-themes/sapphire-themes/Makefile
+++ b/x11-themes/sapphire-themes/Makefile
@@ -25,17 +25,17 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 do-patch:
-	${REINPLACE_CMD} 's:~/\.:${X11BASE}/share/:g' \
+	${REINPLACE_CMD} 's:~/\.:${LOCALBASE}/share/:g' \
 		${WRKDIR}/menu/default \
 		${WRKDIR}/themes/*.theme
 	${REINPLACE_CMD} 's:-15-:-12-:g' ${WRKDIR}/themes/*.theme
 
 do-install:
-	${MKDIR} ${X11BASE}/share/sapphire/themes/backgrounds/
+	${MKDIR} ${LOCALBASE}/share/sapphire/themes/backgrounds/
 	${INSTALL_DATA} ${WRKDIR}/themes/backgrounds/* \
-		${X11BASE}/share/sapphire/themes/backgrounds/
+		${LOCALBASE}/share/sapphire/themes/backgrounds/
 	${INSTALL_DATA} ${WRKDIR}/themes/*.theme \
-		${X11BASE}/share/sapphire/themes/
-	${INSTALL_DATA} ${WRKDIR}/menu/default ${X11BASE}/share/sapphire/menu/
+		${LOCALBASE}/share/sapphire/themes/
+	${INSTALL_DATA} ${WRKDIR}/menu/default ${LOCALBASE}/share/sapphire/menu/
 
 .include <bsd.port.mk>
diff --git a/x11-themes/xmms-bluecurve-theme/Makefile b/x11-themes/xmms-bluecurve-theme/Makefile
index 00729e135917..b41976809bfd 100644
--- a/x11-themes/xmms-bluecurve-theme/Makefile
+++ b/x11-themes/xmms-bluecurve-theme/Makefile
@@ -6,6 +6,7 @@
 #
 
 PORTNAME=	xmms-bluecurve-theme
+PORTREVISION=	1
 
 COMMENT=	The Bluecurve XMMS skin
 
@@ -14,9 +15,9 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms \
 
 MASTERDIR=	${.CURDIR}/../bluecurve-themes
 
-NO_BUILD=	yes
+PREFIX=		${LOCALBASE}
 
-PREFIX=		${X11BASE}
+NO_BUILD=	yes
 
 SKIN=		Bluecurve-xmms.zip
 PLIST_FILES=	share/xmms/Skins/${SKIN}
diff --git a/x11-themes/xmms-eq-skins/Makefile b/x11-themes/xmms-eq-skins/Makefile
index 1f89d7c4e74e..c3f28679f20e 100644
--- a/x11-themes/xmms-eq-skins/Makefile
+++ b/x11-themes/xmms-eq-skins/Makefile
@@ -9,14 +9,14 @@ PORTNAME=	xmms-eq-skins
 PORTVERSION=	0.2
 PORTREVISION=	3
 CATEGORIES=	x11-themes
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	equ
 DISTNAME=	eq-xmms-skins-${PORTVERSION}
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Additional skins for the XMMS EQ plugin
 
-RUN_DEPENDS=	${X11BASE}/lib/xmms/Effect/libeq.so:${PORTSDIR}/audio/xmms-eq
+RUN_DEPENDS=	${LOCALBASE}/lib/xmms/Effect/libeq.so:${PORTSDIR}/audio/xmms-eq
 
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/EQskins
diff --git a/x11-toolkits/SoXt/Makefile b/x11-toolkits/SoXt/Makefile
index 7fb73fc8f0f2..167cc8b9cb9d 100644
--- a/x11-toolkits/SoXt/Makefile
+++ b/x11-toolkits/SoXt/Makefile
@@ -21,7 +21,7 @@ USE_MOTIF=	yes
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS+=	--with-pthread=yes --with-coin=${X11BASE}
+CONFIGURE_ARGS+=	--with-pthread=yes --with-coin=${LOCALBASE}
 # avoid renaming of soxt-config and soxt-config.1
 CONFIGURE_TARGET=	--target=""
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/Xaw3d/files/pkg-message.in b/x11-toolkits/Xaw3d/files/pkg-message.in
index 6bfd4a6fdef1..524bf4343d50 100644
--- a/x11-toolkits/Xaw3d/files/pkg-message.in
+++ b/x11-toolkits/Xaw3d/files/pkg-message.in
@@ -2,7 +2,7 @@
 If you want Xaw3d to replace the default Athena Widget Set
 so most X applications will get a 3-D look, do this (as root):
 
-cd %%X11BASE%%/lib
+cd %%LOCALBASE%%/lib
 mv libXaw.so.%%XAWVER%% libXaw2d.so.%%XAWVER%%
 ln -s libXaw3d.so.%%XAWVER%% libXaw.so.%%XAWVER%%
 *******************************************************************
diff --git a/x11-toolkits/XawPlus/Makefile b/x11-toolkits/XawPlus/Makefile
index cf0d983bf74b..806eb835f7b5 100644
--- a/x11-toolkits/XawPlus/Makefile
+++ b/x11-toolkits/XawPlus/Makefile
@@ -20,13 +20,13 @@ USE_XORG=	x11 xaw
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 MAKE_ARGS=	CC="${CC}" FLAGS="${CFLAGS} -fPIC -DHAS_WCHAR_H" \
-		INC_PATH="-I. -I${X11BASE}/include" LIB_PATH="-L${X11BASE}/lib"
+		INC_PATH="-I. -I${LOCALBASE}/include" LIB_PATH="-L${LOCALBASE}/lib"
 ALL_TARGET=	lib
 USE_LDCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:so\.3\..:so.3:' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's:%%X11BASE%%:${X11BASE}:' ${WRKSRC}/test/Makefile
+	@${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' ${WRKSRC}/test/Makefile
 
 do-install:
 	@${MKDIR} ${PREFIX}/include/X11/XawPlus
diff --git a/x11-toolkits/XawPlus/files/patch-test::Makefile b/x11-toolkits/XawPlus/files/patch-test::Makefile
index e0450de740ab..2d8c3dd64ba0 100644
--- a/x11-toolkits/XawPlus/files/patch-test::Makefile
+++ b/x11-toolkits/XawPlus/files/patch-test::Makefile
@@ -14,7 +14,7 @@ $FreeBSD$
  
 -LIB_PATH =	-L/usr/X11/lib			# Libraries for X
 -INC_PATH =	-I/usr/X11/include		# Header for X
-+PREFIX=%%X11BASE%%
++PREFIX=%%XLOCALBASE%%
 +
 +LIB_PATH =	-L$(PREFIX)/lib			# Libraries for X
 +INC_PATH =	-I$(PREFIX)/include		# Header for X
diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile
index 67a098310368..c3c071128f56 100644
--- a/x11-toolkits/efltk/Makefile
+++ b/x11-toolkits/efltk/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	efltk
 PORTVERSION=	2.0.7
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ede
+MASTER_SITES=	SF/ede
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Extended Fast Light Toolkit
@@ -27,7 +27,6 @@ CONFIGURE_ARGS+=	--disable-mysql
 USE_MYSQL=	yes
 .endif
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	autoconf:213
@@ -36,6 +35,7 @@ CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" \
 		DEBUGFLAG="${CFLAGS} -I${LOCALBASE}/include"
 MAKE_ENV+=	LD_LIBRARY_PATH="${WRKSRC}/lib"
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+USE_XORG=	x11 xext
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile
index ea053d3f2564..459fc9acca17 100644
--- a/x11-toolkits/enhance/Makefile
+++ b/x11-toolkits/enhance/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	enhance
 PORTVERSION=	20080223
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.springdaemons.com/pub/snapshots/e17/
 
@@ -17,7 +17,6 @@ COMMENT=	A library for rapid application development with ETK/Glade
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_LDCONFIG=	yes
 USE_EFL=	ecore etk exml
diff --git a/x11-toolkits/flu/Makefile b/x11-toolkits/flu/Makefile
index 3f633b77cf07..ac477c725445 100644
--- a/x11-toolkits/flu/Makefile
+++ b/x11-toolkits/flu/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	flu
 PORTVERSION=	2.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://www.osc.edu/~jbryan/FLU/
 DISTNAME=	FLU_${PORTVERSION}
@@ -17,10 +17,10 @@ COMMENT=	A library containing extra widgets for FLTK
 
 LIB_DEPENDS=	fltk:${PORTSDIR}/x11-toolkits/fltk
 
-USE_GL=		yes
+USE_GL=		gl
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} --I=${X11BASE}/include --L=${X11BASE}/lib
+CONFIGURE_ARGS=	--prefix=${PREFIX} --I=${LOCALBASE}/include --L=${LOCALBASE}/lib
 USE_GMAKE=	yes
 PORTDOCS=	*
 
diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile
index b12e9587c43d..48293ad5b72a 100644
--- a/x11-toolkits/fox12/Makefile
+++ b/x11-toolkits/fox12/Makefile
@@ -39,8 +39,8 @@ USE_LDCONFIG=	yes
 
 MAN1=		shutterbug.1 reswrap.1
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 OPTIONS=	XFT	"Enable Xft support" on \
 		SHM	"Enable Shared Memory support" on \
diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile
index d0f5c30d5e75..83e62a50cc5f 100644
--- a/x11-toolkits/fox14/Makefile
+++ b/x11-toolkits/fox14/Makefile
@@ -39,8 +39,8 @@ USE_LDCONFIG=	yes
 
 MAN1=		shutterbug.1 reswrap.1
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 OPTIONS=	OPTIMIZED_CXXFLAGS "Enable additional optimizations" off \
 		CUPS "Enable CUPS support" off \
diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile
index 648831563951..7e292b55ceb8 100644
--- a/x11-toolkits/fox16/Makefile
+++ b/x11-toolkits/fox16/Makefile
@@ -38,8 +38,8 @@ USE_LDCONFIG=	yes
 
 MAN1=		shutterbug.1 reswrap.1
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 
 OPTIONS=	XFT	"Enable Xft support" on \
 		SHM	"Enable Shared Memory support" on \
diff --git a/x11-toolkits/gai/Makefile b/x11-toolkits/gai/Makefile
index a2be4b266a7c..6475b66a083a 100644
--- a/x11-toolkits/gai/Makefile
+++ b/x11-toolkits/gai/Makefile
@@ -8,10 +8,9 @@
 
 PORTNAME=	gai
 PORTVERSION=	0.5.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	General Applet Interface Library
@@ -19,7 +18,7 @@ COMMENT=	General Applet Interface Library
 LIB_DEPENDS=	gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext
 
 USE_BZIP2=	yes
-USE_GL=		yes
+USE_GL=		gl
 USE_SDL=	sdl
 USE_GNOME=	gnomepanel
 GNU_CONFIGURE=	yes
@@ -30,11 +29,11 @@ PLIST_FILES=	include/gai/gai.h lib/libgai.so.${PORTVERSION} \
 		share/locale/de/LC_MESSAGES/gai.mo
 PLIST_DIRS=	include/gai
 PORTDOCS=	*
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|sdl-config --|${SDL_CONFIG} --|g; \
-		s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/configure
+		s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/gai/files/patch-gai_Makefile.in b/x11-toolkits/gai/files/patch-gai_Makefile.in
index e023337f203c..11088b83c594 100644
--- a/x11-toolkits/gai/files/patch-gai_Makefile.in
+++ b/x11-toolkits/gai/files/patch-gai_Makefile.in
@@ -8,7 +8,7 @@
 +CFLAGS += -Wall -fPIC -I.. @GTK_CFLAGS@ @SDL_CFLAGS@ @GNOME_CFLAGS@ @GL_CFLAGS@
  
 -LDFLAGS += -g -fPIC -L/usr/X11R6/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ 
-+LDFLAGS += -fPIC -L$(X11BASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ 
++LDFLAGS += -fPIC -L$(LOCALBASE)/lib -lX11 @SYSTEM_SPECIFIC_LIBS@ @GTK_LIBS@ @GTHREAD_CFLAGS@ @PANGO_CFLAGS@ 
  LDFLAGS += @GNOME_LIBS@ @GL_LIBS@ @SDL_LIBS@ @GTHREAD_LIBS@ @PANGO_LIBS@
  
  CC = @CC@
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index e97e654c05ec..b593cac91b9f 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gal
 PORTVERSION=	0.24
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES?=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.24
@@ -19,7 +19,7 @@ COMMENT=	A collection of widgets taken from GNOME gnumeric and evolution
 LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier libglade gnomevfs
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 135a82205632..eab6728ee157 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gal2
 PORTVERSION=	2.5.3
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/2.5
@@ -27,7 +27,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack libgnomeui libgnomeprintui \
 		ltverhack
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=  libtool:15
 CONFIGURE_ARGS=	--enable-static --with-libiconv
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index b7b0a7b7d7fc..ab2965e87cdd 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -7,6 +7,7 @@
 #
 
 PORTNAME=	gdl
+PORTREVISION=	1
 PORTVERSION=	0.7.11
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
@@ -16,7 +17,6 @@ COMMENT=	Components intended to be shared between GNOME development tools
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index 9be85de3ff5e..2d9cf5049a35 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	gnocl
 PORTVERSION=	0.9.90
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gnocl
+MASTER_SITES=	SF/gnocl
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ and Gnome extension for Tcl
@@ -19,12 +18,11 @@ BUILD_DEPENDS=	${LOCALBASE}/include/tcl8.4/tcl.h:${PORTSDIR}/lang/tcl84
 
 USE_GMAKE=	yes
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 BUILD_WRKSRC=	${WRKSRC}/src
 CFLAGS+=	-I${LOCALBASE}/include/tcl8.4
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
 .include <bsd.port.pre.mk>
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index d7591fcb4a31..b149f837e2fc 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	1.2.10
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gtk+/1.2
@@ -16,8 +16,8 @@ DISTNAME=	gtk+-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gimp Toolkit for X11 GUI (previous stable version)
 
-USE_XLIB=	yes
 USE_PERL5=	yes
+USE_XORG=	x11 ice xext sm inputproto xi
 USE_GNOME=	glib12
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 13e10e3a5e9a..ff45cf8b855c 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.12.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -41,11 +41,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
-USE_XORG=	dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \
-		xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \
-		xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \
-		xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \
-		xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
+USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 13e10e3a5e9a..ff45cf8b855c 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.12.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \
 		ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \
@@ -41,11 +41,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack atk pango ltverhack
 USE_GETTEXT=	yes
-USE_XORG=	dmx fontenc fontutil ice libfs oldx sm x11 xau xaw xaw6 xaw7 \
-		xaw8 xbitmaps xcomposite xcursor xdamage xdmcp xevie xext \
-		xfixes xfont xfontcache xft xi xinerama xkbfile xkbui xmu xmuu \
-		xp xpm xprintapputil xprintutil xrandr xrender xres xscrnsaver \
-		xt xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm
+USE_XORG=	xext xrender x11 xinerama xi xrandr xcursor xfixes
 CONFIGURE_ARGS=	--enable-static --with-xinput=yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 \
 			  -I${LOCALBASE}/include" \
diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index 0a0428db61f1..8e3c04ad14c0 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A GTK+2 widget to display large amounts of numerical data
 
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 CONFLICTS=	gtkdatabox-0.1.*
 
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index 5c343aaa92f2..d47c98bdc5e4 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -30,8 +30,8 @@ CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-lib-GL
 USE_LDCONFIG=	yes
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU \
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -lGL -lGLU \
 		${PTHREAD_LIBS}
 
 post-patch:
diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index 19b08b180d4a..3acb314f00ad 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	gtkscintilla
 PORTVERSION=	0.8.2
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	moleskine
 DISTNAME=	GtkScintilla-${PORTVERSION}
 
diff --git a/x11-toolkits/gtkscintilla/files/patch-aa b/x11-toolkits/gtkscintilla/files/patch-aa
index 3bc361620331..5a77f159c259 100644
--- a/x11-toolkits/gtkscintilla/files/patch-aa
+++ b/x11-toolkits/gtkscintilla/files/patch-aa
@@ -20,7 +20,7 @@ $FreeBSD$
 -CFLAGS = $(shell gtk-config --cflags) -g -Wall -DGTK -DSCI_LEXER
 -LDFLAGS_PRE = $(shell gtk-config --libs) -DGTK 
 -LDFLAGS_POST =  $(LEXERS)  $(SCINTILLA_LIB) -lstdc++
-+SCINTILLA_INCLUDE = $(X11BASE)/include/scintilla
++SCINTILLA_INCLUDE = $(LOCALBASE)/include/scintilla
 +SCINTILLA_LIB = -lscintilla
 +SCINTILLA_IFACE = scintilla/include/Scintilla.iface
 +LEXERS = -lscintilla_lexers
diff --git a/x11-toolkits/gtksourceview/Makefile b/x11-toolkits/gtksourceview/Makefile
index 2c769257c55c..63e63ba36598 100644
--- a/x11-toolkits/gtksourceview/Makefile
+++ b/x11-toolkits/gtksourceview/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtksourceview
 PORTVERSION=	1.8.5
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,7 +22,6 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/gtksourceview2/Makefile b/x11-toolkits/gtksourceview2/Makefile
index bc77ffdda8ab..43805f728024 100644
--- a/x11-toolkits/gtksourceview2/Makefile
+++ b/x11-toolkits/gtksourceview2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gtksourceview2
 PORTVERSION=	2.2.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,7 +23,6 @@ COMMENT=	A text widget that adds syntax highlighting to the GtkTextView widget
 .if !defined(REFERENCE_PORT)
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index 6ea8a33ab896..e6912d1fc7c4 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	guile-gtk
 PORTVERSION=	0.60
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits scheme
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +17,6 @@ COMMENT=	Guile binding library for GTK+
 
 LIB_DEPENDS=	guile.18:${PORTSDIR}/lang/guile
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget ltverhack gdkpixbuf libglade
 USE_AUTOTOOLS=	libtool:15
diff --git a/x11-toolkits/hs-frantk/files/patch-src::Makefile b/x11-toolkits/hs-frantk/files/patch-src::Makefile
index 3766c69e9c3d..1f9777ac186a 100644
--- a/x11-toolkits/hs-frantk/files/patch-src::Makefile
+++ b/x11-toolkits/hs-frantk/files/patch-src::Makefile
@@ -26,7 +26,7 @@
 -CC_INC =  -I/usr/X11/include -I/usr/local/include
 +#CC = gcc
 +CC_OPTS = ${CFLAGS}
-+CC_INC =  -I${X11BASE}/include -I/usr/local/include/tk8.4 -I/usr/local/include/tcl8.4
++CC_INC =  -I${LOCALBASE}/include -I/usr/local/include/tk8.4 -I/usr/local/include/tcl8.4
  
 -GHC = ghc-5.00.2
 -GHC-PKG=ghc-pkg-5.00.2
@@ -51,7 +51,7 @@
  # The directories containing the X11, Tcl and Tk (binary) libraries:
  
 -CCLIB = -L /usr/lib/X11 -L /usr/local/lib
-+CCLIB = -L ${X11BASE}/lib/X11 -L /usr/local/lib
++CCLIB = -L ${LOCALBASE}/lib/X11 -L /usr/local/lib
  
  
  # the libraries required by Tcl/Tk:
diff --git a/x11-toolkits/itk/files/Makefile.lib b/x11-toolkits/itk/files/Makefile.lib
index 420cb3e3086f..5fbff64a0cd5 100644
--- a/x11-toolkits/itk/files/Makefile.lib
+++ b/x11-toolkits/itk/files/Makefile.lib
@@ -5,7 +5,7 @@ CFLAGS+=	-I. -I./../generic \
 		-I${TCL_INCLUDEDIR}/generic \
 		-I${PREFIX}/include/itcl${MAJOR}.${MINOR}/ \
 		-I${TK_INCLUDEDIR}/generic \
-		-I${X11BASE}/include \
+		-I${LOCALBASE}/include \
 		-DHAVE_GETCWD=1 -DNO_VALUES_H=1 -DHAVE_UNISTD_H=1 -DUSE_TERMIOS=1\
 		-DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_TM_ZONE=1\
 		-DHAVE_TM_GMTOFF=1 -DHAVE_ST_BLKSIZE=1 -DSTDC_HEADERS=1\
@@ -14,7 +14,7 @@ CFLAGS+=	-I. -I./../generic \
 		-DHAVE_SYS_FILIO_H=1 \
 		-DRETSIGTYPE=void \
 		-DITK_LIBRARY=\"${ITK_LIBRARY}\"
-LDADD+=		-L${PREFIX}/lib -litcl -L${X11BASE}/lib -lX11 -ltk${USE_TK}
+LDADD+=		-L${PREFIX}/lib -litcl -L${LOCALBASE}/lib -lX11 -ltk${USE_TK}
 
 .PATH:		${.CURDIR}/generic
 
diff --git a/x11-toolkits/jdic/Makefile b/x11-toolkits/jdic/Makefile
index d6114f73aabd..6dd4232f4a69 100644
--- a/x11-toolkits/jdic/Makefile
+++ b/x11-toolkits/jdic/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	jdic
 PORTVERSION=	20061102
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits java
 MASTER_SITES=	https://jdic.dev.java.net/files/documents/880/43269/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS_REASON=	the required com.sun.jnlp is part of jawaws.jar, only ins
 
 USE_ZIP=	yes
 USE_ANT=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 xext
 USE_GNOME=	pkgconfig # libgnome
 USE_JAVA=	yes
 JAVA_VERSION=	1.5+
@@ -53,7 +53,7 @@ PLIST_FILES=	%%JAVAJARDIR%%/jdic.jar	\
 
 pre-configure:
 .for mk in ${MKFILES}
-	${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g;	\
+	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g;	\
 		s|/usr/local|${LOCALBASE}|g'		\
 		${WRKSRC}/jdic/src/unix/native/${mk}/Makefile
 .endfor
diff --git a/x11-toolkits/libbonoboui/Makefile b/x11-toolkits/libbonoboui/Makefile
index 66d0623c6786..b6db9143479e 100644
--- a/x11-toolkits/libbonoboui/Makefile
+++ b/x11-toolkits/libbonoboui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libbonoboui
 PORTVERSION=	2.22.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,7 +22,6 @@ USE_BZIP2=	yes
 .if !defined(REFERENCE_PORT)
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack \
diff --git a/x11-toolkits/libbonobouimm/Makefile b/x11-toolkits/libbonobouimm/Makefile
index da6404778222..8ecf1d868ada 100644
--- a/x11-toolkits/libbonobouimm/Makefile
+++ b/x11-toolkits/libbonobouimm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libbonobouimm
 PORTVERSION=	1.3.7
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -21,11 +21,10 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20 \
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack lthack gnomeprefix libbonoboui
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index 47b92a91db78..57a222cd17c3 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgail-gnome
 PORTVERSION=	1.20.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +18,6 @@ COMMENT=	An implementation of the ATK interfaces for GNOME widgets
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XLIB=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 GNOME_DESKTOP_VERSION=2
diff --git a/x11-toolkits/libgdiplus/Makefile b/x11-toolkits/libgdiplus/Makefile
index c00d621b9adf..8892a673809a 100644
--- a/x11-toolkits/libgdiplus/Makefile
+++ b/x11-toolkits/libgdiplus/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	libgdiplus
 PORTVERSION=	1.2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://go-mono.com/sources/${PORTNAME}/
 
@@ -17,13 +17,15 @@ COMMENT=	GDI+ API for System.Windows.Forms in Mono
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
-		png.5:${PORTSDIR}/graphics/png
+		png.5:${PORTSDIR}/graphics/png \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype.9:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack gnometarget glib20
 USE_GMAKE=	yes
-INSTALLS_SHLIB=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 xrender
+USE_LDCONFIG=	yes
 LIBTOOLFILES=	configure cairo/configure
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 11375f7efe7c..83b7b51258fb 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomeprintui
 PORTVERSION=	2.18.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,8 +21,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/mi
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeprint libgnomecanvas \
 		intlhack ltverhack
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index caccf4604d7d..6dd936cb6da6 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libgnomeprintuimm
 PORTVERSION=	2.5.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -22,11 +22,9 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack libgnomeprintui
-USE_GCC=	3.4+
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static
 
diff --git a/x11-toolkits/libgnomeuimm/Makefile b/x11-toolkits/libgnomeuimm/Makefile
index 92af142277b0..10b52aef17ec 100644
--- a/x11-toolkits/libgnomeuimm/Makefile
+++ b/x11-toolkits/libgnomeuimm/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	libgnomeuimm
 PORTVERSION=	2.0.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-toolkits gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkmm
+MASTER_SITES=	SF/gtkmm
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
@@ -22,11 +21,10 @@ LIB_DEPENDS=	gnomemm-2.0:${PORTSDIR}/x11/libgnomemm \
 		glademm-2.0:${PORTSDIR}/devel/libglademm
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnomeui
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index fd926d660f85..e7b2f78a7522 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomeuimm
 PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,12 +28,11 @@ LATEST_LINK=	libgnomeuimm26
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 USE_GNOME=	gnomehack libgnomeui
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
 PLIST_SUB=	VERSION="2.6" API_VERSION="2.6"
diff --git a/x11-toolkits/libgtk-java/Makefile b/x11-toolkits/libgtk-java/Makefile
index c7c168614fa1..0b860d490958 100644
--- a/x11-toolkits/libgtk-java/Makefile
+++ b/x11-toolkits/libgtk-java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgtk-java
 PORTVERSION=	2.10.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits java
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,7 +19,6 @@ COMMENT=	Java wrapper for Gtk+, Pango, Atk, and Glib
 LIB_DEPENDS=	cairojni-${CAIRO_API_VERSION}.1:${PORTSDIR}/graphics/cairo-java
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index a9251b339c7d..4f65bafbc224 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libpanelappletmm
 PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -21,9 +22,7 @@ LIB_DEPENDS=	gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 USE_GNOME=	gnomehack lthack gnomepanel
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 15f0627fcf9e..021312fd41b3 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libzvt
 PORTVERSION=	2.0.1
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.0
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library components for Zed's Virtual Terminal
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 USE_BISON=	build
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index 4dd5f4b0f1d7..adb044dcbd61 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST=		pkg-plist.${LINUX_RPM_ARCH}
 USE_XLIB=	yes
 
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 1dafd3ad6f80..8b06cf40192a 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -27,7 +27,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_XLIB=	yes
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
 PLIST_SUB=	LIBVERSION="600.10" PORTVERSION="${PORTVERSION}"
 SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index 9f0c8a58bcf2..2e60b92a475d 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -26,7 +26,7 @@ USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
 PLIST_SUB+=	LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}"
 
diff --git a/x11-toolkits/linux-f10-qt33/Makefile b/x11-toolkits/linux-f10-qt33/Makefile
index 347e898de162..753837c5d79b 100644
--- a/x11-toolkits/linux-f10-qt33/Makefile
+++ b/x11-toolkits/linux-f10-qt33/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux
 USE_LINUX_RPM=	yes
 RPMVERSION=	15.5
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST=		pkg-plist.${LINUX_RPM_ARCH}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index 4dd5f4b0f1d7..adb044dcbd61 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST=		pkg-plist.${LINUX_RPM_ARCH}
 USE_XLIB=	yes
 
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index 1dafd3ad6f80..8b06cf40192a 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -27,7 +27,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_XLIB=	yes
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
 PLIST_SUB=	LIBVERSION="600.10" PORTVERSION="${PORTVERSION}"
 SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index 9f0c8a58bcf2..2e60b92a475d 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -26,7 +26,7 @@ USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
 PLIST_SUB+=	LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}"
 
diff --git a/x11-toolkits/linux-f8-qt33/Makefile b/x11-toolkits/linux-f8-qt33/Makefile
index 347e898de162..753837c5d79b 100644
--- a/x11-toolkits/linux-f8-qt33/Makefile
+++ b/x11-toolkits/linux-f8-qt33/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux
 USE_LINUX_RPM=	yes
 RPMVERSION=	15.5
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST=		pkg-plist.${LINUX_RPM_ARCH}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index 4dd5f4b0f1d7..adb044dcbd61 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -20,7 +20,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST=		pkg-plist.${LINUX_RPM_ARCH}
 USE_XLIB=	yes
 
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index 1dafd3ad6f80..8b06cf40192a 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -27,7 +27,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_XLIB=	yes
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
 PLIST_SUB=	LIBVERSION="600.10" PORTVERSION="${PORTVERSION}"
 SRC_DISTFILES=	${PORTNAME}-${PORTVERSION}-2.fc4.4.src.rpm \
diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index 9f0c8a58bcf2..2e60b92a475d 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -26,7 +26,7 @@ USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
 USE_LINUX_RPM=	yes
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 BRANDELF_DIRS=	usr/bin
 PLIST_SUB+=	LIBVERSION="1001.1" PORTVERSION="${PORTVERSION}"
 
diff --git a/x11-toolkits/linux-qt33/Makefile b/x11-toolkits/linux-qt33/Makefile
index 347e898de162..753837c5d79b 100644
--- a/x11-toolkits/linux-qt33/Makefile
+++ b/x11-toolkits/linux-qt33/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux
 USE_LINUX_RPM=	yes
 RPMVERSION=	15.5
 LINUX_DIST_VER=	4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST=		pkg-plist.${LINUX_RPM_ARCH}
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile
index 9a8361e018b1..e6de52a891a6 100644
--- a/x11-toolkits/mesgui/Makefile
+++ b/x11-toolkits/mesgui/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	mesgui
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Make a simple GUI under OpenGL
@@ -18,16 +17,16 @@ COMMENT=	Make a simple GUI under OpenGL
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
 
 USE_SDL=	sdl
-USE_GL=		yes
+USE_GL=		gl
 USE_GMAKE=	yes
 MAKE_ENV=	OPT="${OPT}" LDFLAGS="${LDFLAGS}"
 USE_LDCONFIG=	yes
 
 OPT=		${CFLAGS} -fPIC -DPIC -Iinclude \
 		`${SDL_CONFIG} --cflags` `freetype-config --cflags` \
-		-I${LOCALBASE}/include -I${X11BASE}/include
+		-I${LOCALBASE}/include
 LDFLAGS=	`${SDL_CONFIG} --libs` `freetype-config --libs` \
-		-L${LOCALBASE}/lib -L${X11BASE}/lib
+		-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CC|#CC|g ; \
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 6e29125ba5bb..ff7cf12aad1f 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
 USE_AUTOTOOLS=	libtool:15
 USE_XORG=	xpm
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-xawm=Xaw3d
 
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index 6f0eb05f5038..854c970956a0 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	neXtaw
 PORTVERSION=	0.15.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://siag.nu/pub/neXtaw/
 
@@ -15,11 +15,11 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Athena Widgets with N*XTSTEP appearance
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
+USE_XORG=	xmu x11 xext
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index b6cd2366de74..38c6cf5ecd72 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -10,7 +10,7 @@ PORTNAME=	open-motif
 PORTVERSION=	2.2.3
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://ftp.motifzone.com/%SUBDIR%/                              
+MASTER_SITES=	http://ftp.motifzone.com/%SUBDIR%/
 MASTER_SITE_SUBDIR=	om${PORTVERSION}/src
 DISTNAME=	openMotif-${PORTVERSION}
 EXTRACT_SUFX=	.tar.gz
@@ -25,7 +25,7 @@ USE_GMAKE=	yes
 USE_XORG=	xaw xbitmaps
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-DCSRG_BASED -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 MAKE_ENV=	LANG=C
 
 DEMOS_SRC=	${WRKSRC}/demos/programs
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index 261193eda4a5..ace18fb54cd5 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -44,7 +44,7 @@ MAN3=	Prima::Clipboard.3.gz Prima::Drawable.3.gz Prima::File.3.gz Prima::Image.3
 
 CONFIGURE_ARGS+=	CC="${CC}" CCFLAGS="${CFLAGS}" PREFIX="${PREFIX}" \
 			INSTALL_MAN3="${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3" \
-			INSTALL_MAN1="${PREFIX}/man/man1" X11BASE="${X11BASE}"
+			INSTALL_MAN1="${PREFIX}/man/man1" X11BASE="${LOCALBASE}"
 CONFIGURE_SCRIPT=	Makefile.PL
 USE_XORG=		x11 xpm xext xrender
 USE_PERL5=		yes
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index 03a8394815d5..f2276fc50bec 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -24,7 +24,7 @@ PERL_CONFIGURE=	yes
 MAN3=		Tcl::Tk.3
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile.PL
 
 do-configure:
 	-@cd ${CONFIGURE_WRKSRC} && \
diff --git a/x11-toolkits/p5-Tk-TableMatrix/Makefile b/x11-toolkits/p5-Tk-TableMatrix/Makefile
index 2fe2ac550fae..3d1502566fb6 100644
--- a/x11-toolkits/p5-Tk-TableMatrix/Makefile
+++ b/x11-toolkits/p5-Tk-TableMatrix/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	5.8.0+
-CONFIGURE_ARGS=	X11LIB=${X11BASE}/lib X11INC=${X11BASE}/include
+CONFIGURE_ARGS=	X11LIB=${LOCALBASE}/lib X11INC=${LOCALBASE}/include
 
 MAN3=		Tk::TableMatrix.3 \
 		Tk::TableMatrix::Spreadsheet.3 \
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 66362ddec61f..e61dd5b9316f 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A re-port of a perl5 interface to Tk8.4
 
 PERL_CONFIGURE=	5.8.0+
 USE_XORG=	x11
-CONFIGURE_ARGS=	X11LIB=${X11BASE}/lib X11INC=${X11BASE}/include
+CONFIGURE_ARGS=	X11LIB=${LOCALBASE}/lib X11INC=${LOCALBASE}/include
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 MAN1=		ptked.1 \
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 9ca35c32c473..5114edeec114 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -29,7 +29,7 @@ LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 SHLIB_VER=	4
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index ce0d341cc569..caec5399e048 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -26,7 +26,7 @@ USE_AUTOTOOLS=	libtool:15
 USE_SDL=	sdl image ttf
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${PREFIX}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 SHLIB_VER=	4
 PLIST_SUB=	SHLIB_VER="${SHLIB_VER}"
diff --git a/x11-toolkits/php-gtk/Makefile b/x11-toolkits/php-gtk/Makefile
index 9333cae05e5c..ad775ffe18a2 100644
--- a/x11-toolkits/php-gtk/Makefile
+++ b/x11-toolkits/php-gtk/Makefile
@@ -24,7 +24,7 @@ IGNORE_WITH_PHP=	5
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 WRKSRC=${WRKDIR}/php_gtk-${PORTVERSION}
 
 OPTIONS=	LIBGLADE	"GladeXML support in php-gtk" on \
@@ -68,7 +68,7 @@ PLIST_SUB+=	GDKPIXBUF="@comment "
 .if !defined(WITHOUT_GTKHTML)
 USE_GNOME+=	gtkhtml
 CONFIGURE_ARGS+=	--enable-gtkhtml
-ENVSCE+=	-DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${X11BASE}/include/gal-1.0
+ENVSCE+=	-DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${LOCALBASE}/include/gal-1.0
 PLIST_SUB+=	GTKHTML=""
 .else
 PLIST_SUB+=	GTKHTML="@comment "
diff --git a/x11-toolkits/php-gtk2/Makefile b/x11-toolkits/php-gtk2/Makefile
index 9333cae05e5c..ad775ffe18a2 100644
--- a/x11-toolkits/php-gtk2/Makefile
+++ b/x11-toolkits/php-gtk2/Makefile
@@ -24,7 +24,7 @@ IGNORE_WITH_PHP=	5
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	gtk12
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 WRKSRC=${WRKDIR}/php_gtk-${PORTVERSION}
 
 OPTIONS=	LIBGLADE	"GladeXML support in php-gtk" on \
@@ -68,7 +68,7 @@ PLIST_SUB+=	GDKPIXBUF="@comment "
 .if !defined(WITHOUT_GTKHTML)
 USE_GNOME+=	gtkhtml
 CONFIGURE_ARGS+=	--enable-gtkhtml
-ENVSCE+=	-DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${X11BASE}/include/gal-1.0
+ENVSCE+=	-DHAVE_HTML=1 -I${LOCALBASE}/include/gal-1.0 # -DPHP_GTK_COMPILE_DL_GTKHTML=1 -DGTKHTML_HAVE_GCONF=1 -I${LOCALBASE}/include/gal-1.0
 PLIST_SUB+=	GTKHTML=""
 .else
 PLIST_SUB+=	GTKHTML="@comment "
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index cd3ae23ed2a5..fd90e4db1ee0 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -7,19 +7,19 @@
 
 PORTNAME=	plib
 PORTVERSION=	1.8.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	http://plib.sourceforge.net/dist/
 
 MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	A portable library for joystick/sound/OpenGL GUI/3D math
 
-USE_GL=		yes
+USE_GL=		glu
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CXXFLAGS+=	-fPIC
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 post-build:
 	${CC} ${CFLAGS} -o ${WRKDIR}/plib-jscal ${FILESDIR}/jsBSDCal.c
diff --git a/x11-toolkits/py-fox/Makefile b/x11-toolkits/py-fox/Makefile
index 9469499ca404..ce7532f11318 100644
--- a/x11-toolkits/py-fox/Makefile
+++ b/x11-toolkits/py-fox/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	fox
 PORTVERSION=	1.0.5
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	fxpy
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	FXPy-${PORTVERSION}
@@ -30,7 +30,7 @@ DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/setup.py
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/setup.py
 
 do-install:
 	@(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS})
diff --git a/x11-toolkits/py-fox/files/patch-setup b/x11-toolkits/py-fox/files/patch-setup
index fb2d40fe3576..0ebeea955eca 100644
--- a/x11-toolkits/py-fox/files/patch-setup
+++ b/x11-toolkits/py-fox/files/patch-setup
@@ -7,8 +7,8 @@
 +    XLIBINC = []
  else:
 -    XLIBDIR = ['/usr/X11R6/lib']
-+    XLIBDIR = ['%%X11BASE%%/lib']
-+    XLIBINC = ['%%X11BASE%%/include']
++    XLIBDIR = ['%%LOCALBASE%%/lib']
++    XLIBINC = ['%%LOCALBASE%%/include']
  
  # Other libraries
  OLIBDIRS = ['c:\cygwin\usr\local\lib']
diff --git a/x11-toolkits/py-tkinter/files/setup.py b/x11-toolkits/py-tkinter/files/setup.py
index 8bf615a02b02..a3bd3da94179 100644
--- a/x11-toolkits/py-tkinter/files/setup.py
+++ b/x11-toolkits/py-tkinter/files/setup.py
@@ -18,7 +18,7 @@ except:
 tkversion = "8.4"
 prefix = sysconfig.PREFIX
 # Python 1.5 doesn't have os.getenv()?
-x11base = os.environ['X11BASE'] or '/usr/X11R6'
+x11base = os.environ['LOCALBASE'] or '/usr/X11R6'
 inc_dirs = [prefix + "/include",
             prefix + "/include/tcl" + tkversion,
             prefix + "/include/tk" + tkversion,
diff --git a/x11-toolkits/py-wmdockapps/Makefile b/x11-toolkits/py-wmdockapps/Makefile
index 80e4d48a9931..bfe8db0f3e83 100644
--- a/x11-toolkits/py-wmdockapps/Makefile
+++ b/x11-toolkits/py-wmdockapps/Makefile
@@ -23,6 +23,6 @@ PYDISTUTILS_PKGNAME=	pywmdockapps
 USE_XORG=	x11 xpm xau xext xfixes xi
 
 post-patch:
-	${REINPLACE_CMD} 's|/usr/X11R6|${X11BASE}|' ${WRKSRC}/setup.py
+	${REINPLACE_CMD} 's|/usr/X11R6|${LOCALBASE}|' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 6bb94353f176..1c4647d86a34 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -98,7 +98,7 @@ PYDISTUTILS_BUILDARGS+=	\
 			NO_HEADERS=1 \
 			NO_SCRIPTS=1 \
 			INSTALL_MULTIVERSION=0
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 . if defined(WITH_WXPYTHON_UNICODE)
 WX_UNICODE=	yes
diff --git a/x11-toolkits/qscintilla/Makefile b/x11-toolkits/qscintilla/Makefile
index 5b4f8dea4d5d..45d5e83c4abf 100644
--- a/x11-toolkits/qscintilla/Makefile
+++ b/x11-toolkits/qscintilla/Makefile
@@ -31,7 +31,7 @@ OPTIONS=	DESIGNER_PLUGIN "Install plugin for Qt Designer" on \
 
 QMAKE=		${LOCALBASE}/bin/qmake
 SPEC=		${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-PLUGINDIR=	${X11BASE}/lib/plugins/designer
+PLUGINDIR=	${LOCALBASE}/lib/plugins/designer
 
 .include <bsd.port.pre.mk>
 
@@ -89,9 +89,9 @@ post-configure:
 		${MV} Makefile.tmp Makefile && \
 		cd ${WRKSRC}/designer && \
 		${CAT} designer.pro | ${GREP} -v lqscintilla > designer.tmp && \
-		${ECHO} "INCPATH += ${X11BASE}/include ../qt" >> \
+		${ECHO} "INCPATH += ${LOCALBASE}/include ../qt" >> \
 			designer.tmp && \
-		${ECHO} "LIBS += -L../qt -L${X11BASE}/lib -lqscintilla" >> \
+		${ECHO} "LIBS += -L../qt -L${LOCALBASE}/lib -lqscintilla" >> \
 			designer.tmp && \
 		${ECHO} "DESTDIR = ." >> designer.tmp && \
 		${MV} designer.tmp designer.pro )
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 2c41a6c0c872..f9564fcf9c1c 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	qt
 PORTVERSION=	3.3.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES?=	x11-toolkits ipv6
 MASTER_SITES=	${MASTER_SITE_QT}
 DISTNAME=	qt-x11-free-${PORTVERSION}
@@ -30,7 +30,6 @@ CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
 
 USE_BZIP2=	yes
 REINPLACE_ARGS=	-i ""
-USE_X_PREFIX=	yes
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -77,10 +76,10 @@ PACKAGE_COOKIE=	${WRKDIR}/.package_done.${PORTNAME}.${PREFIX:S/\//_/g}
 
 PREFIX_REAL!=	/bin/realpath ${PREFIX}
 
-# The previous Qt port versions installed qmake and qmake's specs under X11BASE
+# The previous Qt port versions installed qmake and qmake's specs under LOCALBASE
 # The new devel/qmake port installs them under LOCALBASE. We can use
 # either one here, but we prefer the newer:
-.for d in ${X11BASE} ${LOCALBASE} ${PREFIX}
+.for d in ${LOCALBASE} ${PREFIX}
 .	if exists($d/share/qt/mkspecs/freebsd-g++/qplatformdefs.h)
 QTBASE=$d
 PLATFORM=${QTBASE}/share/qt/mkspecs/freebsd-g++
@@ -157,7 +156,7 @@ CONFLICTS+=	qt-3.3.*
 CONFLICTS+=	qt-copy-[0-9]*
 .endif
 
-.if exists(${X11BASE}/include/qt2/qapp.h)
+.if exists(${LOCALBASE}/include/qt2/qapp.h)
 BROKEN=	You have QT2 headers installed!  Installing this port
 BROKEN+=will result in conflicts between QT3 and QT2!
 .endif
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 1be9f8b3140e..8ab844b78fbc 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gui
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES?=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,7 +18,8 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical user interface library
 
-LIB_DEPENDS?=	png:${PORTSDIR}/graphics/png
+LIB_DEPENDS?=	png:${PORTSDIR}/graphics/png \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
 
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build corelib
@@ -27,7 +28,8 @@ QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_XLIB=	yes
+USE_XORG=	xrender xrandr xinerama inputproto xfixes sm xcursor \
+		xext x11 ice xi xt
 
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
diff --git a/x11-toolkits/qwt4/Makefile b/x11-toolkits/qwt4/Makefile
index 5431d532ebe9..9d2a82da3c5b 100644
--- a/x11-toolkits/qwt4/Makefile
+++ b/x11-toolkits/qwt4/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	qwt
 PORTVERSION=	4.2.0
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=qwt
 
 MAINTAINER=	makc@issp.ac.ru
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 580088b73b61..1407d5c15b1c 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	rep-gtk2
 PORTVERSION=	0.18
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -21,7 +21,6 @@ LIB_DEPENDS=	rep.13:${PORTSDIR}/lang/librep
 
 PLIST_SUB=	GNUHOST=${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libglade2
 WANT_GNOME=	yes
diff --git a/x11-toolkits/ruby-fox10/Makefile b/x11-toolkits/ruby-fox10/Makefile
index 1ca0a8bffdae..e2b43f25b206 100644
--- a/x11-toolkits/ruby-fox10/Makefile
+++ b/x11-toolkits/ruby-fox10/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	fox
 PORTVERSION=	1.0.29
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits ruby
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	fxruby
+MASTER_SITES=	SF/fxruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	FXRuby-${PORTVERSION}
 DIST_SUBDIR=	ruby
@@ -39,7 +38,7 @@ DOCS_EN=	ANNOUNCE	ChangeLog	README	\
 post-patch:
 	${RUBY} -i -p \
 		-e 'gsub %r:/usr/local\b:, "${LOCALBASE}"' \
-		-e 'gsub %r:/usr/X11R6\b:, "${X11BASE}"' \
+		-e 'gsub %r:/usr/X11R6\b:, "${LOCALBASE}"' \
 		${WRKSRC}/ext/fox/extconf.rb
 
 post-install:
diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 2e61dbd2a625..049d867e20d6 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -35,11 +35,11 @@ INSTALL_TARGET=	site-install
 DOCS=		COPYING.LIB ChangeLog README
 
 post-patch: general-patch
-	@${REINPLACE_CMD} -e 's|/usr/share|${X11BASE}/share|g' \
+	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
 		${WRKSRC}/sample/gtk-demo/common.rb
 	@${REINPLACE_CMD} -e 's|local/bin/ruby|bin/env ruby|g' \
 		${WRKSRC}/sample/misc/button2.rb
-	@${REINPLACE_CMD} -e 's|/usr/local/share|${X11BASE}/share|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local/share|${LOCALBASE}/share|g' \
 			${WRKSRC}/sample/testgtk/testgtk*
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
diff --git a/x11-toolkits/ruby-tk/Makefile b/x11-toolkits/ruby-tk/Makefile
index ae596dd93438..68e9716664f7 100644
--- a/x11-toolkits/ruby-tk/Makefile
+++ b/x11-toolkits/ruby-tk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tk
 PORTVERSION=	${RUBY_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTREVISION=	${RUBY_PORTREVISION}
 PORTEPOCH=	1
 CATEGORIES+=	x11-toolkits ruby tcl tk
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 RUBY_EXTCONF_SUBDIRS=	. tkutil
-USE_XLIB=	yes
+USE_XORG=	x11
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -41,7 +41,7 @@ LIB_DEPENDS=	tcl${TK_VERSION:S/.//}:${TCLPORTDIR}${TK_VERSION:C/[^0-9]//g} \
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
-		--with-X11-dir=${X11BASE} \
+		--with-X11-dir=${LOCALBASE} \
 		--with-tcl-include=${LOCALBASE}/include/tcl${TK_VERSION} \
 		--with-tk-include=${LOCALBASE}/include/tk${TK_VERSION}
 .if defined(WITH_TCLTK_JP)
diff --git a/x11-toolkits/scx/Makefile b/x11-toolkits/scx/Makefile
index b15847397981..7a0fdb74c58d 100644
--- a/x11-toolkits/scx/Makefile
+++ b/x11-toolkits/scx/Makefile
@@ -26,7 +26,7 @@ EXPIRATION_DATE=	2007-10-28
 PLIST_SUB=	TARGET=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
+	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 			-e 's|echo aout|echo elf|g' \
 	${WRKSRC}/configure
 
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index ee1f48d3ea95..a9432ef476a6 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 WRKSRC=		${WRKDIR}/sspkg2.1
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	OPENWINHOME=${X11BASE}
+MAKE_ENV=	OPENWINHOME=${LOCALBASE}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11-toolkits/soqt/Makefile b/x11-toolkits/soqt/Makefile
index aeccb78bd7b5..d3ec517de8d0 100644
--- a/x11-toolkits/soqt/Makefile
+++ b/x11-toolkits/soqt/Makefile
@@ -24,7 +24,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	QTDIR="${QT_PREFIX}"
-CONFIGURE_ARGS=	--with-pthread=yes --with-coin=${X11BASE}
+CONFIGURE_ARGS=	--with-pthread=yes --with-coin=${LOCALBASE}
 USE_LDCONFIG=	yes
 
 MAN1=		soqt-config.1
diff --git a/x11-toolkits/swt-devel/files/patch-build.sh b/x11-toolkits/swt-devel/files/patch-build.sh
index 6a5a8a47d4b4..ab957afbc30b 100644
--- a/x11-toolkits/swt-devel/files/patch-build.sh
+++ b/x11-toolkits/swt-devel/files/patch-build.sh
@@ -10,7 +10,7 @@
  	export SWT_PTR_CFLAGS
  	if [ -d /lib64 ]; then
 -		XLIB64=-L/usr/X11R6/lib64
-+		XLIB64=-L${X11BASE}/lib64
++		XLIB64=-L${LOCALBASE}/lib64
  		export XLIB64
  	fi
  fi
diff --git a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
index e8e5ada9c555..290378a0ad82 100644
--- a/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
+++ b/x11-toolkits/swt-devel/files/patch-make_freebsd.mak
@@ -14,7 +14,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
  
@@ -23,7 +23,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
@@ -31,7 +31,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
diff --git a/x11-toolkits/swt/files/patch-build.sh b/x11-toolkits/swt/files/patch-build.sh
index 6a5a8a47d4b4..ab957afbc30b 100644
--- a/x11-toolkits/swt/files/patch-build.sh
+++ b/x11-toolkits/swt/files/patch-build.sh
@@ -10,7 +10,7 @@
  	export SWT_PTR_CFLAGS
  	if [ -d /lib64 ]; then
 -		XLIB64=-L/usr/X11R6/lib64
-+		XLIB64=-L${X11BASE}/lib64
++		XLIB64=-L${LOCALBASE}/lib64
  		export XLIB64
  	fi
  fi
diff --git a/x11-toolkits/swt/files/patch-make_freebsd.mak b/x11-toolkits/swt/files/patch-make_freebsd.mak
index 4c61c9940da6..5c371d69a986 100644
--- a/x11-toolkits/swt/files/patch-make_freebsd.mak
+++ b/x11-toolkits/swt/files/patch-make_freebsd.mak
@@ -14,7 +14,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
  
@@ -23,7 +23,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
@@ -31,7 +31,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
diff --git a/x11-toolkits/swt31/Makefile b/x11-toolkits/swt31/Makefile
index e8b394fd5ac7..56f66f24da99 100644
--- a/x11-toolkits/swt31/Makefile
+++ b/x11-toolkits/swt31/Makefile
@@ -21,7 +21,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_GMAKE=	yes
 USE_ZIP=	yes
 MAKEFILE=	make_freebsd.mak
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 PLIST_SUB=	BUILD=${SWT_VERSION}
 PLIST_FILES=	%%JAVAJARDIR%%/swt.jar \
 		lib/libswt-atk-gtk-%%BUILD%%.so \
diff --git a/x11-toolkits/swt31/files/patch-build.sh b/x11-toolkits/swt31/files/patch-build.sh
index 9a0767cf0f7c..2a9b1860949e 100644
--- a/x11-toolkits/swt31/files/patch-build.sh
+++ b/x11-toolkits/swt31/files/patch-build.sh
@@ -8,7 +8,7 @@
 +		CC=%%CC%%
 +		CXX=%%CXX%%
 +		LD=%%CC%%
-+		XTEST_LIB_PATH=$X11BASE/lib
++		XTEST_LIB_PATH=$LOCALBASE/lib
 +		GECKO_INCLUDES="`${GECKO_CONFIG} --cflags gtkmozembed` -I${LOCALBASE}/include/nspr"
 +		GECKO_LIBS="`${GECKO_CONFIG} --libs gtkmozembed` -L${LOCALBASE}/lib"
 +		case $MODEL in
diff --git a/x11-toolkits/swt31/files/patch-make_freebsd.mak b/x11-toolkits/swt31/files/patch-make_freebsd.mak
index 37a506210299..bb76702289ed 100644
--- a/x11-toolkits/swt31/files/patch-make_freebsd.mak
+++ b/x11-toolkits/swt31/files/patch-make_freebsd.mak
@@ -42,7 +42,7 @@
 -		-fpic \
 +		-I$(JAVA_HOME)/include/freebsd \
 +		-fpic -fPIC \
-+		-I$(X11BASE)/include \
++		-I$(LOCALBASE)/include \
  		${SWT_PTR_CFLAGS}
 -LIBS = -shared -fpic -s
 +LIBS = -shared -fpic -fPIC -s
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index 18dbfa4a5a2c..580ab9f1fa55 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -19,7 +19,6 @@ USE_TK=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR} \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--exec-prefix=${PREFIX} --enable-shared
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
 TCL_INCLUDES=	-I${LOCALBASE}/include/tcl${TK_VER} -I${LOCALBASE}/include/tcl${TK_VER}/generic
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index 41cbe7f48053..4295e2abb1df 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${TCL84_PORT}:build \
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix/tk8.4
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-sam \
 		--with-tclconfig="${PREFIX}/lib/tcl8.4" \
diff --git a/x11-toolkits/tix/files/patch-aa b/x11-toolkits/tix/files/patch-aa
index 16f5af159508..e2a77c4365f0 100644
--- a/x11-toolkits/tix/files/patch-aa
+++ b/x11-toolkits/tix/files/patch-aa
@@ -22,7 +22,7 @@
 -    eval "TIX_LIB_FILE=libtix${TCL_SHARED_LIB_SUFFIX}"
 -    TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS}"
 +    eval "TIX_LIB_FILE=libtix${LIB_VERSION}.so.1"
-+    TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${X11BASE}/lib -lX11 -ltk84"
++    TIX_MAKE_LIB="\${SHLIB_LD} -o ${TIX_LIB_FILE} \${OBJS} ${SHLIB_LD_LIBS} -L${PREFIX}/lib -L\${LOCALBASE}/lib -lX11 -ltk84"
  
      # The Tcl SAM library
      #
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index dec3bd4a45ef..da82dc3aefbe 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -290,8 +290,7 @@ post-configure:
 
 pre-build:
 	@cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} \
-	    SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
-	    X11BASE="${X11BASE}"
+	    SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR}
 
 post-install:
 	${LN} -sf ${TK_LIB_FILE} ${PREFIX}/lib/${TK_LIB}
diff --git a/x11-toolkits/tk80/files/Makefile.lib b/x11-toolkits/tk80/files/Makefile.lib
index 866a2d47e7e1..ae5a1f320b1d 100644
--- a/x11-toolkits/tk80/files/Makefile.lib
+++ b/x11-toolkits/tk80/files/Makefile.lib
@@ -1,7 +1,7 @@
 NOPROFILE=	yes
 LIB=		tk80
 TK_LIBRARY=	${PREFIX}/lib/tk80
-CFLAGS+=	-I. -I./../generic -I../bitmaps -I$(X11BASE)/include \
+CFLAGS+=	-I. -I./../generic -I../bitmaps -I$(LOCALBASE)/include \
 		-I${PREFIX}/include/tcl8.0/generic \
 		-DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DSTDC_HEADERS=1 \
 		 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 \
diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile
index db09c415c75b..7427b86055cd 100644
--- a/x11-toolkits/tkdnd/Makefile
+++ b/x11-toolkits/tkdnd/Makefile
@@ -21,7 +21,6 @@ USE_TK=		yes
 USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--with-tclinclude=${TCL_INCLUDEDIR} --with-tkinclude=${TK_INCLUDEDIR} --enable-shared
 CPPFLAGS=	-I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index 15c2aaad9b61..b468aac600d3 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -19,7 +19,6 @@ USE_TK=		yes
 USE_XORG=	x11 xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--with-tkinclude=${TK_INCLUDEDIR} --enable-shared
 CPPFLAGS=	-I${TK_INCLUDEDIR}/generic -I${TCL_INCLUDEDIR}/generic
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index 02fea821a3fe..cd92e6adda19 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -18,7 +18,6 @@ USE_TK=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR} \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--exec-prefix=${PREFIX} --enable-shared
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
 TCL_INCLUDES=	-I${TCL_INCLUDEDIR} -I${TCL_INCLUDEDIR}/generic
diff --git a/x11-toolkits/v/files/patch-configs-ConfigX.mk b/x11-toolkits/v/files/patch-configs-ConfigX.mk
index 6dceb83a2a24..2f2ccadbe963 100644
--- a/x11-toolkits/v/files/patch-configs-ConfigX.mk
+++ b/x11-toolkits/v/files/patch-configs-ConfigX.mk
@@ -39,8 +39,8 @@
 -INCDIR  +=       -I/usr/$(X11RV)/include
 -LIBDIR  +=       -L/usr/$(X11RV)/lib
 -LIBS    +=       -lV -lXmu -lXt -lXext -lX11 -lxm
-+INCDIR  +=       -I$(X11BASE)/include
-+LIBDIR  +=       -L$(X11BASE)/lib
++INCDIR  +=       -I$(LOCALBASE)/include
++LIBDIR  +=       -L$(LOCALBASE)/lib
 +LIBS    +=       -lXmu -lXt -lXext -lX11
  TARZ    =
  RANLIB  =       ranlib
diff --git a/x11-toolkits/viewkit/Makefile b/x11-toolkits/viewkit/Makefile
index 8ca82b1205ca..368f8ac41996 100644
--- a/x11-toolkits/viewkit/Makefile
+++ b/x11-toolkits/viewkit/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	viewkit
 PORTVERSION=	0.00
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.hungry.com/pub/hungry/viewkit/ \
 		${MASTER_SITE_LOCAL}
@@ -19,7 +19,6 @@ COMMENT=	ViewKit workalike from Hungry Programmers
 
 USE_AUTOTOOLS=	autoconf:261:env
 MOTIFPACKAGE?=	open-motif
-USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-${MOTIFPACKAGE}
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index 8acfedd088a9..8c0e4a7690ab 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -8,18 +8,16 @@
 
 PORTNAME=	viewklass
 PORTVERSION=	0.7.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	ViewKlass-${PORTVERSION}
 
 MAINTAINER=	araujo@FreeBSD.org
 COMMENT=	C++ Framework for Motif
 
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 
-USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/x11-toolkits/vte/Makefile b/x11-toolkits/vte/Makefile
index 8c18795ef389..e6b7129e9828 100644
--- a/x11-toolkits/vte/Makefile
+++ b/x11-toolkits/vte/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	vte
 PORTVERSION=	0.16.13
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,7 +23,6 @@ USE_BZIP2=	yes
 
 USE_GMAKE=	yes
 USE_BISON=	build
-USE_XLIB=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GETTEXT=	yes
diff --git a/x11-toolkits/wmapp/Makefile b/x11-toolkits/wmapp/Makefile
index 09c448a1e9fd..fbb6a4358cc9 100644
--- a/x11-toolkits/wmapp/Makefile
+++ b/x11-toolkits/wmapp/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A DockApp Graphics Library
 
 USE_XORG=	x11 xpm
 USE_GMAKE=	yes
-CFLAGS+=	-I${X11BASE}/include
+CFLAGS+=	-I${LOCALBASE}/include
 ALL_TARGET=	# empty
 PLIST_FILES=	lib/libwmapp.a
 
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index c464c493b892..d6a0e4b53a03 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.4.2
-PORTREVISION?=	15
+PORTREVISION?=	16
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxwindows
+MASTER_SITES=	SF/wxwindows
 DISTNAME=	wxGTK-${PORTVERSION}
 
 MAINTAINER?=	fjoe@FreeBSD.org
@@ -22,8 +21,8 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GL=		yes
+USE_XORG=	x11 sm xxf86vm xinerama
+USE_GL=		glu
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
@@ -38,12 +37,10 @@ CONFIGURE_ARGS=	--with-libpng=sys \
 		--includedir=${PREFIX}/include/wx-2.4
 CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include \
 			  -I${LOCALBASE}/include \
-			  -I${X11BASE}/include \
 			  ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -liconv \
-			 -L${X11BASE}/lib \
 			 ${PTHREAD_LIBS}"\
-		X11BASE="${X11BASE}"
+		X11BASE="${LOCALBASE}"
 NO_LATEST_LINK=	yes
 PLIST=		${.CURDIR}/pkg-plist
 
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index 1c434ffa9fc9..b6e1a5568fbb 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.6.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxwindows
+MASTER_SITES=	SF/wxwindows
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 DISTNAME=	wxGTK-${PORTVERSION}
 
@@ -23,8 +23,8 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png\
 		mspack.1:${PORTSDIR}/archivers/libmspack
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GL=		yes
+USE_XORG=	x11 sm xxf86vm xinerama
+USE_GL=		glu
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GNOME=	gtk20
@@ -38,13 +38,11 @@ CONFIGURE_ARGS=	--with-libpng=sys\
 		--with-mspack\
 		--with-gtk\
 		--disable-backtrace
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-			  -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv \
-			 -L${X11BASE}/lib" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -liconv" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"\
-		X11BASE="${X11BASE}"
+		X11BASE="${LOCALBASE}"
 NO_LATEST_LINK=	yes
 PLIST=		${.CURDIR}/pkg-plist
 
@@ -56,7 +54,7 @@ CONFLICTS=	wxgtk2-contrib-devel-2.5.2*
 .endif
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common
+RUN_DEPENDS=	${LOCALBASE}/include/wx-2.6/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk26-common
 .endif
 
 .if ${WXGTK_FLAVOR:M*-common} != ""
@@ -72,7 +70,7 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
 USE_WX=		2.6
-RUN_DEPENDS=	${X11BASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
+RUN_DEPENDS=	${LOCALBASE}/include/wx-2.6/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk26-contrib-common
 
 .if ${WXGTK_FLAVOR:M*-unicode*} != ""
 WX_UNICODE=	yes
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index 7dd6aaae3bc4..f21d7dc8ff29 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.8.7
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxwindows
+MASTER_SITES=	SF/wxwindows
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 DISTNAME=	wxGTK-${PORTVERSION:rc1=-rc1}
 
@@ -23,8 +23,8 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png\
 		mspack.1:${PORTSDIR}/archivers/libmspack
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GL=		yes
+USE_XORG=	x11 sm xxf86vm xinerama 
+USE_GL=		glu
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GNOME=	gtk20 gconf2
@@ -44,7 +44,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
 		WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"\
-		X11BASE="${X11BASE}"
+		X11BASE="${LOCALBASE}"
 PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
@@ -54,7 +54,7 @@ PORTREVISION=	0
 .endif
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS=	${X11BASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
+RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
 .endif
 
 .if ${WXGTK_FLAVOR:M*-common} != ""
@@ -70,7 +70,7 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
 USE_WX=		2.8
-RUN_DEPENDS=	${X11BASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
+RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
 
 .if ${WXGTK_FLAVOR:M*-unicode*} != ""
 WX_UNICODE=	yes
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index 7dd6aaae3bc4..f21d7dc8ff29 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	wx
 PORTVERSION=	2.8.7
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	wxwindows
+MASTER_SITES=	SF/wxwindows
 PKGNAMESUFFIX=	${WXGTK_FLAVOR}
 DISTNAME=	wxGTK-${PORTVERSION:rc1=-rc1}
 
@@ -23,8 +23,8 @@ LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png\
 		mspack.1:${PORTSDIR}/archivers/libmspack
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_GL=		yes
+USE_XORG=	x11 sm xxf86vm xinerama 
+USE_GL=		glu
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_GNOME=	gtk20 gconf2
@@ -44,7 +44,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}"\
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"\
 		WXCONFIG_CPPFLAGS="${PTHREAD_CFLAGS}"\
 		PTHREAD_LIBS="${PTHREAD_LIBS}"\
-		X11BASE="${X11BASE}"
+		X11BASE="${LOCALBASE}"
 PLIST=		${.CURDIR}/pkg-plist
 
 WXGTK_FLAVOR?=	gtk2
@@ -54,7 +54,7 @@ PORTREVISION=	0
 .endif
 
 .if ${WXGTK_FLAVOR} != "gtk2-common"
-RUN_DEPENDS=	${X11BASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
+RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/wx.h:${PORTSDIR}/x11-toolkits/wxgtk28-common
 .endif
 
 .if ${WXGTK_FLAVOR:M*-common} != ""
@@ -70,7 +70,7 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
 USE_WX=		2.8
-RUN_DEPENDS=	${X11BASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
+RUN_DEPENDS=	${LOCALBASE}/include/wx-2.8/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk28-contrib-common
 
 .if ${WXGTK_FLAVOR:M*-unicode*} != ""
 WX_UNICODE=	yes
diff --git a/x11-toolkits/xclasses/Makefile b/x11-toolkits/xclasses/Makefile
index 32a248f96452..8ea1b34ce0e1 100644
--- a/x11-toolkits/xclasses/Makefile
+++ b/x11-toolkits/xclasses/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xclasses
 PORTVERSION=	1.4.0
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xcmail
+MASTER_SITES=	SF/xcmail
 DISTNAME=	Xclasses-public-${PORTVERSION}.src
 
 MAINTAINER=	ports@FreeBSD.org
@@ -33,7 +32,7 @@ pre-configure:
 	@${PERL} -pi \
 		-e "s|%%CXX%%|${CXX}|g;" \
 		-e "s|%%CXXFLAGS%%|${CXXFLAGS}|g;" \
-		-e "s|%%X11BASE%%|${X11BASE}|g;" ${WRKSRC}/${file}
+		-e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/${file}
 .endfor
 	${REINPLACE_CMD} -e 's|\([:alnum:]\)\\$$|\1 \\|' ${WRKSRC}/Makefile
 
diff --git a/x11-toolkits/xclasses/files/patch-ac b/x11-toolkits/xclasses/files/patch-ac
index e1f41f34ce5f..2da0aba1c85b 100644
--- a/x11-toolkits/xclasses/files/patch-ac
+++ b/x11-toolkits/xclasses/files/patch-ac
@@ -7,9 +7,9 @@
 -  INCLUDESDIR=${XCLASSESINCLUDE:-"/usr/local/include"}
 -  LIBSDIR=${XCLASSESLIB:-"/usr/local/lib"}
 -  CONFIGSDIR=${XCLASSESCONFIG:-"/usr/lib/X11/Xclasses"}
-+  INCLUDESDIR=%%X11BASE%%/include/
-+  LIBSDIR=%%X11BASE%%/lib/
-+  CONFIGSDIR=%%X11BASE%%/share/Xclasses/
++  INCLUDESDIR=%%LOCALBASE%%/include/
++  LIBSDIR=%%LOCALBASE%%/lib/
++  CONFIGSDIR=%%LOCALBASE%%/share/Xclasses/
    ROOTID=0
  
    if [ "$2" != "quit" ]; then
@@ -38,7 +38,7 @@
  # look for installed XPM lib
    MAKEXPM="y"
 -  for N in /usr/include/X11 /usr/local/include/X11
-+  for N in %%X11BASE%%/include/X11/
++  for N in %%LOCALBASE%%/include/X11/
    do
      if [ -f "$N/xpm.h" ]; then
       MAKEXPM="n"
@@ -47,7 +47,7 @@
  
  # look for shapes
 -  if [ -f "/usr/include/X11/extensions/shape.h" ]; then
-+  if [ -f "%%X11BASE%%/include/X11/extensions/shape.h" ]; then
++  if [ -f "%%LOCALBASE%%/include/X11/extensions/shape.h" ]; then
      USESHAPE="y"
    else
      USESHAPE="n"
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 1bc7c2480e3e..a3bf1b9b2414 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -32,18 +32,18 @@ PATCHFILES=	xforms-1.0-i18n_7.patch
 PATCH_DIST_STRIP=	-p1
 .endif
 
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GL=		gl
 USE_IMAKE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=		fdesign.1 fd2ps.1
 
 post-patch:
 	${REINPLACE_CMD} -e 's|-O4||' ${WRKSRC}/Imakefile
-.if defined(X11BASE)
-.	if ${X11BASE} != "/usr/X11R6"
-	${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \
+.if defined(LOCALBASE)
+.	if ${LOCALBASE} != "/usr/X11R6"
+	${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/image/rgb_db.c
 .	endif
 .endif
diff --git a/x11-toolkits/xg/files/patch-aa b/x11-toolkits/xg/files/patch-aa
index 0f1e8f1841a4..30390f1c11a0 100644
--- a/x11-toolkits/xg/files/patch-aa
+++ b/x11-toolkits/xg/files/patch-aa
@@ -6,7 +6,7 @@
  #
 -MOTIF_INC =
 -CFLAGS    = "-DUSE_XM_MWMUTIL_H -DUSE_XGPM -I../include ${MOTIF_INC}"
-+MOTIF_INC = -I${X11BASE}/include -I${X11BASE}/include/X11
++MOTIF_INC = -I${LOCALBASE}/include -I${LOCALBASE}/include/X11
 +CFLAGS    += -DUSE_XM_MWMUTIL_H -DUSE_XGPM -DV_USE_TM_ZONE -I../include ${MOTIF_INC}
  
  #
diff --git a/x11-toolkits/xmhtml/files/patch-aa b/x11-toolkits/xmhtml/files/patch-aa
index 88f171a35abf..3339cbd191d8 100644
--- a/x11-toolkits/xmhtml/files/patch-aa
+++ b/x11-toolkits/xmhtml/files/patch-aa
@@ -119,10 +119,10 @@
   
   # Platform specific includes
   ifeq ($(PLATFORM),Motif)
-! PLATFORMINC=-I../../include/XmHTML -I${X11BASE}/include
+! PLATFORMINC=-I../../include/XmHTML -I${LOCALBASE}/include
   else
   ifeq ($(PLATFORM),gtk)
-! PLATFORMINC=-I../../include/gtk-xmhtml -I${X11BASE}/include
+! PLATFORMINC=-I../../include/gtk-xmhtml -I${LOCALBASE}/include
   endif
   endif
   
@@ -142,7 +142,7 @@
   # Motif version (default)
   ifeq ($(PLATFORM),Motif)
   
-! LIBDIR = -L${X11BASE}/lib
+! LIBDIR = -L${LOCALBASE}/lib
   # This is what is required under Linux (Motif 2.0.1).
   # Your mileage may vary.
 ! LIBS   = ${MOTIFLIB} -lXpm -lXmu -lXt -lXext -lX11 -lSM -lICE
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index 74e07751d8f9..85efa7bd6fe6 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xview-clients
 PORTVERSION=	3.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.efd.lth.se/pub/X11/ \
 		ftp://ftp.uni-heidelberg.de/pub/X11/contrib/libraries/ \
@@ -23,7 +23,6 @@ PATCH_DEPENDS=	${NONEXISTENT}:${.CURDIR}/../xview:patch
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
 USE_IMAKE=	yes
-USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIRPREFIX}${.CURDIR}/../xview/work/${DISTNAME}
 ALL_TARGET=	Clients
 
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index 279a204b7bc8..c984dd223cd3 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS=	mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 REINPLACE_ARGS=	-i ""
 USE_IMAKE=	yes
 USE_LDCONFIG=	yes
-IMAKEINCLUDE=	"-I${X11BASE}/lib/X11/config -I${WRKSRC}/config"
+IMAKEINCLUDE=	"-I${LOCALBASE}/lib/X11/config -I${WRKSRC}/config"
 MAKE_ENV+=	IMAKEINCLUDE=${IMAKEINCLUDE}
 ALL_TARGET=	World
 SUB_FILES=	pkg-message
@@ -41,7 +41,7 @@ pre-configure:
 	  ${WRKSRC}/config/XView.cf
 	@${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \
 	  ${WRKSRC}/config/XView.tmpl
-	@${REINPLACE_CMD} -e 's+/usr/X11/+${X11BASE}/+g;' \
+	@${REINPLACE_CMD} -e 's+/usr/X11/+${LOCALBASE}/+g;' \
 	  ${WRKSRC}/clients/olwm/screen.c
 	${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+'	\
 		${X11BASE2FIX:C|^|${WRKSRC}/|}
diff --git a/x11-wm/aewm/Makefile b/x11-wm/aewm/Makefile
index ca44b13a3c05..f96a15dada99 100644
--- a/x11-wm/aewm/Makefile
+++ b/x11-wm/aewm/Makefile
@@ -7,17 +7,17 @@
 
 PORTNAME=	aewm
 PORTVERSION=	1.2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.red-bean.com/~decklin/software/aewm/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ICCCM-compliant window manager based on 9wm
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext xt xaw
 WANT_GNOME=	yes
 USE_GMAKE=	yes
-MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${X11BASE}"
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" XROOT="${LOCALBASE}"
 
 MAN1=		aeclients.1 aewm.1
 
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index aec0e3d45a51..6c14d4ee501f 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	afterstep-i18n
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	${MASTER_SITE_AFTERSTEP:S/$/:afterstep/} \
 		${MASTER_SITE_LOCAL:S/$/:local/} \
@@ -30,8 +30,7 @@ COMMENT=	The NeXTstep clone window manager with Fontset support
 RUN_DEPENDS=	asclock:${PORTSDIR}/x11-clocks/asclock
 
 DIST_SUBDIR=	afterstep
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_IMAKE=	yes
 INSTALL_TARGET=	install install.man
 MANCOMPRESSED=	yes
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index fc9e092ec43b..3d4a34816f2d 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	afterstep
 PORTVERSION=	2.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm afterstep
 MASTER_SITES=	ftp://ftp.afterstep.org/stable/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -26,7 +26,7 @@ LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo \
 		rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif
-RUN_DEPENDS=	${X11BASE}/bin/xli:${PORTSDIR}/graphics/xli
+RUN_DEPENDS=	xli:${PORTSDIR}/graphics/xli
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gtk20 pango
diff --git a/x11-wm/ahwm/Makefile b/x11-wm/ahwm/Makefile
index a4a0d7e64dc0..7ed86563e630 100644
--- a/x11-wm/ahwm/Makefile
+++ b/x11-wm/ahwm/Makefile
@@ -8,14 +8,14 @@
 
 PORTNAME=	ahwm
 PORTVERSION=	0.90
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://people.cs.uchicago.edu/~ahiorean/ahwm/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An X11 window manager
 
-USE_XLIB=	yes
+USE_XORG=	x11 xext
 
 GNU_CONFIGURE=	yes
 MAKE_ARGS=	prefix=${PREFIX} exec_prefix=${PREFIX}
diff --git a/x11-wm/alloywm/Makefile b/x11-wm/alloywm/Makefile
index 2ce60b5a0452..bd22dbc16080 100644
--- a/x11-wm/alloywm/Makefile
+++ b/x11-wm/alloywm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	alloywm
 PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.phatboydesigns.net/devel/
 
@@ -17,10 +17,10 @@ COMMENT=	Has title bars, shading, resizing, automatic placement, window list
 BROKEN=		Checksum mismatch
 
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--xroot=${X11BASE}
+CONFIGURE_ARGS=	--xroot=${LOCALBASE}
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 WANT_GNOME=	yes
 REINPLACE_ARGS=	-i'' -E
 SCRIPTS=	${WRKSRC}/scriptdir
@@ -35,11 +35,11 @@ pre-configure:
 do-build:
 	cd ${WRKSRC}/goodies && ${GMAKE}
 .for ii in client events main misc new screen widgets
-	cd ${WRKSRC}/src && ${CC} -c ${CFLAGS} -I${X11BASE}/include \
+	cd ${WRKSRC}/src && ${CC} -c ${CFLAGS} -I${LOCALBASE}/include \
 		${ii}.c
 .endfor
 	cd ${WRKSRC}/src && ${CC} ${CFLAGS} -DSHAPE -o alloywm \
-		-L${X11BASE}/lib -lXext -lX11 \
+		-L${LOCALBASE}/lib -lXext -lX11 \
 		client.o events.o main.o misc.o new.o screen.o widgets.o
 
 pre-install:
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index 544b1aa5c000..5dd6a2a57f95 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amaterus
 PORTVERSION=	0.34.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.taiyaki.org/amaterus/src/
 
@@ -16,7 +16,6 @@ COMMENT=	A GTK+ window manager
 
 LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
-USE_XLIB=	yes
 USE_GNOME=	gtk12
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index 6c7f3e861900..8cea2be72749 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	amiwm
 PORTVERSION=	0.20.p48
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/ \
 		http://www.plig.org/xwinman/archive/amiwm/
@@ -18,7 +18,7 @@ COMMENT=	A window manager that makes your desktop look like an Amiga(TM)
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -DHAVE_X11_EXTENSIONS_SHAPE_H"
-USE_X_PREFIX=	yes
+USE_XORG=	x11 ice sm xext xmu
 MAN1=		amiwm.1
 
 post-install:
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 6a14744567b7..9dc0b40ab15b 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	awesome
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 
@@ -19,7 +20,7 @@ LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
 		cairo.2:${PORTSDIR}/graphics/cairo \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-USE_XLIB=	yes
+USE_XORG=	x11 xft xext xinerama xt xrandr xproto
 
 MAN1=		awesome.1 \
 		awesome-client.1
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index 6a14744567b7..9dc0b40ab15b 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	awesome
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 
@@ -19,7 +20,7 @@ LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
 		cairo.2:${PORTSDIR}/graphics/cairo \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-USE_XLIB=	yes
+USE_XORG=	x11 xft xext xinerama xt xrandr xproto
 
 MAN1=		awesome.1 \
 		awesome-client.1
diff --git a/x11-wm/badwm/Makefile b/x11-wm/badwm/Makefile
index 54cb257a42c5..72bfdd80790f 100644
--- a/x11-wm/badwm/Makefile
+++ b/x11-wm/badwm/Makefile
@@ -7,17 +7,16 @@
 
 PORTNAME=	badwm
 PORTVERSION=	0.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	BadWM-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window manager based on evilwm
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 ice sm xext
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/bbconf/Makefile b/x11-wm/bbconf/Makefile
index 2f782e4267d0..4bf175d4b7d4 100644
--- a/x11-wm/bbconf/Makefile
+++ b/x11-wm/bbconf/Makefile
@@ -7,15 +7,14 @@
 
 PORTNAME=	bbconf
 PORTVERSION=	1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Configurator for the Blackbox window manager
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_QT_VER=	3
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/beryl-core/Makefile b/x11-wm/beryl-core/Makefile
index 0ed02322b5fb..33023f84095e 100644
--- a/x11-wm/beryl-core/Makefile
+++ b/x11-wm/beryl-core/Makefile
@@ -32,8 +32,8 @@ USE_PERL5=	yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--disable-berylmesa
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib  ${PTHREAD_LIBS}"
 
 USE_XORG=	xcomposite xfixes xdamage xrandr ice sm xinerama glproto
 
diff --git a/x11-wm/beryl-manager/Makefile b/x11-wm/beryl-manager/Makefile
index d69a6b98967b..c40b3d5531c6 100644
--- a/x11-wm/beryl-manager/Makefile
+++ b/x11-wm/beryl-manager/Makefile
@@ -25,8 +25,8 @@ USE_GNOME=		glib20 gtk20
 INSTALLS_ICONS=		yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 MAN1=		beryl-manager.1
 
diff --git a/x11-wm/beryl-plugins-unsupported/Makefile b/x11-wm/beryl-plugins-unsupported/Makefile
index 5695175b10a8..d7fadcd7c2c3 100644
--- a/x11-wm/beryl-plugins-unsupported/Makefile
+++ b/x11-wm/beryl-plugins-unsupported/Makefile
@@ -28,7 +28,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/beryl-plugins/Makefile b/x11-wm/beryl-plugins/Makefile
index 49a0a640bff3..41e01c1c06a3 100644
--- a/x11-wm/beryl-plugins/Makefile
+++ b/x11-wm/beryl-plugins/Makefile
@@ -31,8 +31,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS=	DBUS "Enable dbus support" On
 
diff --git a/x11-wm/beryl-settings/Makefile b/x11-wm/beryl-settings/Makefile
index 80b29ebf1cc8..44eeb475a436 100644
--- a/x11-wm/beryl-settings/Makefile
+++ b/x11-wm/beryl-settings/Makefile
@@ -31,7 +31,7 @@ USE_PYTHON=	2.4+
 INSTALLS_ICONS=	yes
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/blwm/Makefile b/x11-wm/blwm/Makefile
index f921330c1582..b0840f887c36 100644
--- a/x11-wm/blwm/Makefile
+++ b/x11-wm/blwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blwm
 PORTVERSION=	1.0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm portuguese
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
@@ -22,8 +22,7 @@ MAN1=		blwm.1x
 PLIST=		${WRKDIR}/pkg-plist
 USE_GMAKE=	yes
 MAKEFILE=	Makefile.std
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 ice sm xext xpm
 DOCS=		AUTHORS BUGS COPYING CREDITS FreeBSD INSTALAR LEIAME TODO
 
 post-patch:
diff --git a/x11-wm/blwm/files/patch-Makefile.std b/x11-wm/blwm/files/patch-Makefile.std
index 93729e357be3..fed87a0bb3db 100644
--- a/x11-wm/blwm/files/patch-Makefile.std
+++ b/x11-wm/blwm/files/patch-Makefile.std
@@ -5,7 +5,7 @@
  # Directory of X Window System
  #
 -XDIR = /usr/X11R6
-+XDIR = $(X11BASE)
++XDIR = $(LOCALBASE)
  
  #
  # Directory where you install blwm binary
diff --git a/x11-wm/clementine/Makefile b/x11-wm/clementine/Makefile
index eb008cf03b90..4ca7577cf460 100644
--- a/x11-wm/clementine/Makefile
+++ b/x11-wm/clementine/Makefile
@@ -7,27 +7,26 @@
 
 PORTNAME=	clementine
 PORTVERSION=	0.0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Has title bars, iconizing, and styles (unstable)
 
 RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv \
-			rxvt:${PORTSDIR}/x11/rxvt
+		rxvt:${PORTSDIR}/x11/rxvt
 
 PLIST=		${WRKDIR}/pkg-plist
 PKGMESSAGE=	${WRKDIR}/pkg-message
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 DOCS=		COPYING HISTORY LICENSE
 REINPLACE_ARGS=	-i'' -E
 
 post-patch:
 	${REINPLACE_CMD} 's:^CFLAGS:IGNORE:g ; s:^DEFINES:IGNORE:g ;\
-		s:/usr/X11R6:${X11BASE}:g' \
+		s:/usr/X11R6:${LOCALBASE}:g' \
 		${WRKSRC}/Makefile
 	${REINPLACE_CMD} 's:./clementine:${PREFIX}/bin/clementine:g' \
 		${WRKSRC}/windowmanager.cpp
diff --git a/x11-wm/compiz-fusion-plugins-extra/Makefile b/x11-wm/compiz-fusion-plugins-extra/Makefile
index 83ab1ab997ef..e63a8a32b9f7 100644
--- a/x11-wm/compiz-fusion-plugins-extra/Makefile
+++ b/x11-wm/compiz-fusion-plugins-extra/Makefile
@@ -49,8 +49,8 @@ GCONF_SCHEMAS=	compiz-addhelper.schemas \
 		compiz-widget.schemas
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-schemas
 
 post-patch:
diff --git a/x11-wm/compiz-fusion-plugins-main/Makefile b/x11-wm/compiz-fusion-plugins-main/Makefile
index afd68ec9b654..fc28ad936376 100644
--- a/x11-wm/compiz-fusion-plugins-main/Makefile
+++ b/x11-wm/compiz-fusion-plugins-main/Makefile
@@ -51,8 +51,8 @@ GCONF_SCHEMAS=	compiz-animation.schemas \
 		compiz-shift.schemas
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-schemas
 
 .include <bsd.port.mk>
diff --git a/x11-wm/compiz-fusion-plugins-unsupported/Makefile b/x11-wm/compiz-fusion-plugins-unsupported/Makefile
index 164a731b9a36..6cdac08ec83d 100644
--- a/x11-wm/compiz-fusion-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-fusion-plugins-unsupported/Makefile
@@ -35,8 +35,8 @@ GCONF_SCHEMAS=	compiz-fakeargb.schemas \
 		compiz-tile.schemas
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-schemas
 
 .include <bsd.port.mk>
diff --git a/x11-wm/compiz-plugins-extra/Makefile b/x11-wm/compiz-plugins-extra/Makefile
index 83ab1ab997ef..e63a8a32b9f7 100644
--- a/x11-wm/compiz-plugins-extra/Makefile
+++ b/x11-wm/compiz-plugins-extra/Makefile
@@ -49,8 +49,8 @@ GCONF_SCHEMAS=	compiz-addhelper.schemas \
 		compiz-widget.schemas
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-schemas
 
 post-patch:
diff --git a/x11-wm/compiz-plugins-main/Makefile b/x11-wm/compiz-plugins-main/Makefile
index afd68ec9b654..fc28ad936376 100644
--- a/x11-wm/compiz-plugins-main/Makefile
+++ b/x11-wm/compiz-plugins-main/Makefile
@@ -51,8 +51,8 @@ GCONF_SCHEMAS=	compiz-animation.schemas \
 		compiz-shift.schemas
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-schemas
 
 .include <bsd.port.mk>
diff --git a/x11-wm/compiz-plugins-unsupported/Makefile b/x11-wm/compiz-plugins-unsupported/Makefile
index 164a731b9a36..6cdac08ec83d 100644
--- a/x11-wm/compiz-plugins-unsupported/Makefile
+++ b/x11-wm/compiz-plugins-unsupported/Makefile
@@ -35,8 +35,8 @@ GCONF_SCHEMAS=	compiz-fakeargb.schemas \
 		compiz-tile.schemas
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-schemas
 
 .include <bsd.port.mk>
diff --git a/x11-wm/compiz/Makefile b/x11-wm/compiz/Makefile
index 26178018d419..ca7d43ceb765 100644
--- a/x11-wm/compiz/Makefile
+++ b/x11-wm/compiz/Makefile
@@ -60,8 +60,8 @@ GCONF_SCHEMAS=	gwd.schemas \
 		compiz-zoom.schemas
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 OPTIONS=	RSVG "Enable librsvg2 support" on \
 		GTK "Enable gtk2 support" on \
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 1b40b99abfe9..b20fd60cc64a 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An extension to twm, with support for multiple virtual screens, etc
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		ctwm.1
 
 .include <bsd.port.pre.mk>
diff --git a/x11-wm/dwm/files/patch-config.mk b/x11-wm/dwm/files/patch-config.mk
index 06a9cdae3fc4..c890eb9f59ad 100644
--- a/x11-wm/dwm/files/patch-config.mk
+++ b/x11-wm/dwm/files/patch-config.mk
@@ -11,8 +11,8 @@
  
 -X11INC = /usr/X11R6/include
 -X11LIB = /usr/X11R6/lib
-+X11INC = $(X11BASE)/include
-+X11LIB = $(X11BASE)/lib
++X11INC = $(LOCALBASE)/include
++X11LIB = $(LOCALBASE)/lib
  
  # includes and libs
  INCS = -I. -I/usr/include -I${X11INC}
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index a2f8d56b53f2..b0f17f21d7de 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -7,29 +7,25 @@
 
 PORTNAME=	enlightenment
 PORTVERSION=	0.16.8.13
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	e16-${PORTVERSION}-0.01
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-
 DATADIR=	${PREFIX}/share/e16
 
-USE_X_PREFIX=	yes
-USE_XORG=	xbitmaps
+USE_XORG=	xbitmaps xft x11
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd --disable-esdtest --disable-dependency-tracking \
 		--disable-rpath
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(WITHOUT_ESOUND)
 USE_GNOME=	esound
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index acd7677dac11..7b7308204b27 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	e16utils
 PORTVERSION=	0.16
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://public.planetmirror.com/pub/enlightenment/e16utils/
@@ -19,7 +19,6 @@ COMMENT=	Standalone menu and keybinding editors for enlightment 0.16
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
-USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 
 SUB_STUBS=	e16menuedit-0.1 e16keyedit-0.2
diff --git a/x11-wm/e16utils/files/patch-e16keyedit-0.2 b/x11-wm/e16utils/files/patch-e16keyedit-0.2
index ddb211f1fc68..2b6ab682c812 100644
--- a/x11-wm/e16utils/files/patch-e16keyedit-0.2
+++ b/x11-wm/e16utils/files/patch-e16keyedit-0.2
@@ -8,7 +8,7 @@ $FreeBSD$
  
  LIB_DIRS = \
 -    -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib
-+    -L${LOCALBASE}/lib -L${X11BASE}/lib
++    -L${LOCALBASE}/lib
  LIBS     = \
 -    `gtk-config --libs` -lgdbm -lgdk_imlib
 -CFLAGS   = \
diff --git a/x11-wm/e16utils/files/patch-e16menuedit-0.1 b/x11-wm/e16utils/files/patch-e16menuedit-0.1
index 038511f933d4..91244e3eb2fa 100644
--- a/x11-wm/e16utils/files/patch-e16menuedit-0.1
+++ b/x11-wm/e16utils/files/patch-e16menuedit-0.1
@@ -8,7 +8,7 @@ $FreeBSD$
  
  LIB_DIRS = \
 -    -L/usr/local/lib -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/dt/lib
-+    -L${LOCALBASE}/lib -L${X11BASE}/lib
++    -L${LOCALBASE}/lib
  LIBS     = \
 -    `gtk-config --libs` -lgdbm -lgdk_imlib
 -CFLAGS   = \
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 4a099724f77f..b6efd2e1e55b 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	ede
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	ede
+MASTER_SITES=	SF
 
 MAINTAINER=	sem@FreeBSD.org
 COMMENT=	Equinox Desktop Environment
@@ -18,7 +18,7 @@ LIB_DEPENDS=	efltk.2:${PORTSDIR}/x11-toolkits/efltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
diff --git a/x11-wm/emerald/Makefile b/x11-wm/emerald/Makefile
index 3bcd63febfbb..eba21799ecf9 100644
--- a/x11-wm/emerald/Makefile
+++ b/x11-wm/emerald/Makefile
@@ -32,8 +32,8 @@ MAN1=		emerald.1 \
 		emerald-theme-manager.1
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 # XXX - might want to change that
 post-patch:
diff --git a/x11-wm/enlightenment-docs/Makefile b/x11-wm/enlightenment-docs/Makefile
index c1d98985a806..2727914d0a3a 100644
--- a/x11-wm/enlightenment-docs/Makefile
+++ b/x11-wm/enlightenment-docs/Makefile
@@ -7,18 +7,17 @@
 
 PORTNAME=	enlightenment-docs
 PORTVERSION=	0.16.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	enlightenment
+MASTER_SITES=	SF
 DISTNAME=	e16-docs-${PORTVERSION}-0.02
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Data files of enlightenment DOX
 
-RUN_DEPENDS=	${X11BASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
+RUN_DEPENDS=	${LOCALBASE}/bin/e16:${PORTSDIR}/x11-wm/enlightenment
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index a2f8d56b53f2..b0f17f21d7de 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -7,29 +7,25 @@
 
 PORTNAME=	enlightenment
 PORTVERSION=	0.16.8.13
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	e16-${PORTVERSION}-0.01
 
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-
 DATADIR=	${PREFIX}/share/e16
 
-USE_X_PREFIX=	yes
-USE_XORG=	xbitmaps
+USE_XORG=	xbitmaps xft x11
 USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-fsstd --disable-esdtest --disable-dependency-tracking \
 		--disable-rpath
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(WITHOUT_ESOUND)
 USE_GNOME=	esound
diff --git a/x11-wm/epiwm/Makefile b/x11-wm/epiwm/Makefile
index 593c5bd88a4f..47a673a249bf 100644
--- a/x11-wm/epiwm/Makefile
+++ b/x11-wm/epiwm/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	epiwm
 PORTVERSION=	0.5.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.nongnu.org/epiwm/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Another fast, small, configurable window manager
 
+USE_XORG=	x11 xpm
 USE_GNOME=	imlib
 GNU_CONFIGURE=	yes
 
diff --git a/x11-wm/evilwm/Makefile b/x11-wm/evilwm/Makefile
index 37db5edb6185..677b0c62539f 100644
--- a/x11-wm/evilwm/Makefile
+++ b/x11-wm/evilwm/Makefile
@@ -23,8 +23,8 @@ PLIST_FILES=	bin/evilwm
 
 CFLAGS+=	-DSOLIDDRAG -DINFOBANNER -DVWM -DSHAPE -DMOUSE -DSNAP \
 		-DSTDIO -DCOLOURMAP -DVERSION=\\\"${PORTVERSION}\\\" \
-		-I${X11BASE}/include
-LDFLAGS=	-L${X11BASE}/lib -lX11 -lXext
+		-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib -lX11 -lXext
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/x11-wm/expocity/Makefile b/x11-wm/expocity/Makefile
index 2638e4fa0396..e7500fb52413 100644
--- a/x11-wm/expocity/Makefile
+++ b/x11-wm/expocity/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	expocity
 PORTVERSION=	2.6.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.pycage.de/download/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-1
@@ -20,14 +20,14 @@ LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 CONFLICTS=	metacity*
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_X11=	x11
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix gnomehack gnomehier gconf2 libglade2
 GCONF_SCHEMAS=	metacity.schemas
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
diff --git a/x11-wm/fbcmd/Makefile b/x11-wm/fbcmd/Makefile
index 0405e4e8352c..2fc9ecf13c90 100644
--- a/x11-wm/fbcmd/Makefile
+++ b/x11-wm/fbcmd/Makefile
@@ -25,7 +25,7 @@ USE_XORG=	x11 xmu
 PLIST_FILES=	bin/fbcmd
 
 post-extract:
-	@${REINPLACE_CMD} -e "s|/usr/X11R6|${X11BASE}|g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s|/usr/X11R6|${LOCALBASE}|g" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fbcmd ${PREFIX}/bin
diff --git a/x11-wm/fluxspace/Makefile b/x11-wm/fluxspace/Makefile
index f33790591794..c30929601032 100644
--- a/x11-wm/fluxspace/Makefile
+++ b/x11-wm/fluxspace/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fluxspace
 PORTVERSION=	0.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13
 
 BROKEN=		Checksum mismatch
 
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_IDESK) || exists(${X11BASE}/bin/idesk)
+.if defined(WITH_IDESK) || exists(${LOCALBASE}/bin/idesk)
 RUN_DEPENDS+=	idesk:${PORTSDIR}/x11/idesk
 .endif
 .if defined(WITH_ROX-FILER) || exists(${LOCALBASE}/bin/rox)
diff --git a/x11-wm/fluxter/Makefile b/x11-wm/fluxter/Makefile
index ac39ccfbb569..3cb56191423c 100644
--- a/x11-wm/fluxter/Makefile
+++ b/x11-wm/fluxter/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	fluxter
 PORTVERSION=	0.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://benedict.isomedia.com/homes/stevencooper/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop pager for the Fluxbox Slit
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 ice xproto xt xaw xext
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index c6fbb78d2519..2a8ab57a8df6 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	fvwm95-i18n
 PORTVERSION=	2.0.43a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	fvwm95
 DISTNAME=	fvwm95-2.0.43a-Autoconf
 DISTFILES=	${EXTRACT_ONLY} fvwm95-2.0.43a-FreeBSD.apmpatch.tar.gz
@@ -23,14 +23,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Win95 lookalike fvwm2 window manager with an I18N patch
 
 LIB_DEPENDS=	rplay.1:${PORTSDIR}/audio/rplay
-RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
+RUN_DEPENDS=	${LOCALBASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
 EXTRACT_ONLY=	${DISTNAME}.tgz ${PORTNAME}-${PORTVERSION}-portKit-19981123.tgz
-USE_X_PREFIX=	yes
-USE_XPM=	yes
-USE_XORG=	xbitmaps
+
+USE_XORG=	xbitmaps x11 xpm xmu xext
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--x-includes=${X11BASE}/include \
+CONFIGURE_ARGS=	--x-includes=${LOCALBASE}/include \
 		--includedir=${LOCALBASE}/include --libdir=${LOCALBASE}/lib
 CONFIGURE_ENV=	INSTALL_MAN="${INSTALL_MAN}"
 MAN1=	fvwm95.1 xpmroot.1 FvwmAudio.1 FvwmAuto.1 FvwmBacker.1 FvwmBanner.1 \
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index a42f17b1e446..ad330eabb35b 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	fvwm95
 PORTVERSION=	2.0.43a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-${PORTVERSION}-Autoconf
 EXTRACT_SUFX=	.tgz
 
@@ -18,11 +17,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Win95 lookalike version of the fvwm2 window manager
 
 LIB_DEPENDS=	rplay.1:${PORTSDIR}/audio/rplay
-RUN_DEPENDS=	${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
+RUN_DEPENDS=	${LOCALBASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
-USE_XORG=	xbitmaps
+USE_XORG=	xbitmaps x11 xpm xmu xext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${LOCALBASE}/include \
 		--libdir=${LOCALBASE}/lib
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index bd42ec6a2beb..a71b1acfaf15 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	golem
 PORTVERSION=	0.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small window manager with themes and plugins
@@ -23,14 +22,14 @@ PLIST_SUB+=	NO_SOUND=""
 PLIST_SUB+=	NO_SOUND="@comment "
 .endif
 
+USE_XORG=	x11 xext xpm
+GNU_CONFIGURE=	yes
+
 .if defined(WANT_XINERAMA)
 CONFIGURE_ARGS+=	--enable-xinerama
+USE_XORG+=	xinerama
 .endif
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
-GNU_CONFIGURE=	yes
-
 MANCOMPRESSED=	yes
 MAN1=		golem.1
 
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index a1855dd09cb9..62f16ea019f2 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gwm
 PORTVERSION=	1.8d
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://koala.ilog.fr/ftp/pub/gwm/
 EXTRACT_SUFX=	.tgz
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic Window Manager
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		gwm.1
 
 DEPRECATED=		Project is dead
diff --git a/x11-wm/hs-xmonad-contrib/Makefile b/x11-wm/hs-xmonad-contrib/Makefile
index 505fd8a35e37..651f6dc75560 100644
--- a/x11-wm/hs-xmonad-contrib/Makefile
+++ b/x11-wm/hs-xmonad-contrib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmonad-contrib
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
 
@@ -19,7 +20,7 @@ BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 RUN_DEPENDS=	xmonad:${PORTSDIR}/x11-wm/xmonad
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
-USE_XLIB=	yes
+USE_XORG=	x11
 
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
 GHC_VERSION=	6.8.2
diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index a5fd4b2b4f91..7a317d8f0b61 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmonad
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
-USE_XLIB=	yes
+USE_XORG=	x11
 
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
 GHC_VERSION=	6.8.2
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index cfb57314069e..d0ddaaa33607 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.35
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
@@ -14,6 +15,7 @@ MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Window Manager designed for speed, usability and consistency
 
 WANT_GNOME=	yes
+USE_XORG=	x11 ice xinerama xext
 USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/ion-2/Makefile b/x11-wm/ion-2/Makefile
index 7f140e932064..6c07b8f32aff 100644
--- a/x11-wm/ion-2/Makefile
+++ b/x11-wm/ion-2/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	ion-2
 PORTVERSION=	20040729
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
 
@@ -17,7 +17,7 @@ COMMENT=	A tiling tabbed window manager
 
 CONFLICTS=	ion-2002* ion-devel-* pwm-*
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext xinerama
 USE_AUTOTOOLS=	libtool:15 libltdl:15
 USE_LUA=	5.0
 USE_GMAKE=	yes
diff --git a/x11-wm/ion-2/files/patch-system.mk b/x11-wm/ion-2/files/patch-system.mk
index 80061f5ff69e..a9391de7a127 100644
--- a/x11-wm/ion-2/files/patch-system.mk
+++ b/x11-wm/ion-2/files/patch-system.mk
@@ -55,7 +55,7 @@
  ##
  
 -X11_PREFIX=/usr/X11R6
-+X11_PREFIX=$(X11BASE)
++X11_PREFIX=$(LOCALBASE)
  # SunOS/Solaris
  #X11_PREFIX=/usr/openwin
  
diff --git a/x11-wm/ion/files/patch-system.mk b/x11-wm/ion/files/patch-system.mk
index e08a035fd705..bee9da4e1b88 100644
--- a/x11-wm/ion/files/patch-system.mk
+++ b/x11-wm/ion/files/patch-system.mk
@@ -29,7 +29,7 @@
  ##
  
 -X11_PREFIX=/usr/X11R6
-+X11_PREFIX=$(X11BASE)
++X11_PREFIX=$(LOCALBASE)
  
  # SunOS/Solaris
  #X11_PREFIX=/usr/openwin
diff --git a/x11-wm/jewel/Makefile b/x11-wm/jewel/Makefile
index 44aacfab0ac8..12d31f855b6c 100644
--- a/x11-wm/jewel/Makefile
+++ b/x11-wm/jewel/Makefile
@@ -26,7 +26,7 @@ post-patch:
 		s|^CFLAGS|#CFLAGS|g; \
 		s|^prefix|#prefix|g; \
 		s|prefix|PREFIX|g; \
-		s|/usr/X11R6|${X11BASE}|g; \
+		s|/usr/X11R6|${LOCALBASE}|g; \
 		s|CC|CXX|g; \
 		s|CFLAGS|CXXFLAGS|g' \
 		${WRKSRC}/Makefile
diff --git a/x11-wm/jwm/Makefile b/x11-wm/jwm/Makefile
index 7772244d79d5..473d9d2392d9 100644
--- a/x11-wm/jwm/Makefile
+++ b/x11-wm/jwm/Makefile
@@ -21,9 +21,9 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		jwm.1
 
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index bd21e9fbc130..ee6cf2f55f0a 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -7,19 +7,16 @@
 
 PORTNAME=	kahakai
 PORTVERSION=	0.6.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	xcas@cox.net
 COMMENT=	Kahakai window manager
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13 \
-	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-RUN_DEPENDS=	\
-	${X11BASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts
+		${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
+RUN_DEPENDS=	${LOCALBASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts
 
 BROKEN=		Does not compile
 
@@ -28,6 +25,7 @@ DEPRECATED=	"Development ceased"
 USE_AUTOTOOLS=	libtool:15
 USE_PERL5_BUILD=yes
 USE_BZIP2=	yes
+USE_XORG=	x11 xft
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
@@ -37,9 +35,9 @@ USE_EFL=	imlib2
 MAN1=		kahakai.1
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		CFLAGS=${PTHREAD_CFLAGS} \
-		LDFLAGS=-L${X11BASE}/lib \
+		LDFLAGS=-L${LOCALBASE}/lib \
 		LIBS=${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
@@ -49,7 +47,7 @@ BROKEN=		"Does not compile on alpha 4.x"
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/tmp/ktest|${X11BASE}|' \
+	@${REINPLACE_CMD} -e 's|/tmp/ktest|${LOCALBASE}|' \
 		${WRKSRC}/data/styles/Default.kastyle.in
 	@${REINPLACE_CMD} -e 's|bool max|bool wmax|' \
 		${WRKSRC}/src/Window.hh
diff --git a/x11-wm/kompmgr/Makefile b/x11-wm/kompmgr/Makefile
index 6a5305cee8dd..e1920068665b 100644
--- a/x11-wm/kompmgr/Makefile
+++ b/x11-wm/kompmgr/Makefile
@@ -29,7 +29,7 @@ PLIST_FILES=	bin/kompmgr
 
 do-build:
 	cd ${WRKSRC}/kwin/kompmgr && \
-	${CC} ${CFLAGS} -I${LOCALBASE}/include -L${X11BASE}/lib -lX11 -lXdamage\
+	${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -lXdamage\
 	-lXfixes -lXrender -lXcomposite -lm -o kompmgr kompmgr.c
 
 do-install:
diff --git a/x11-wm/libcompizconfig/Makefile b/x11-wm/libcompizconfig/Makefile
index 7c58cc97ced5..8c017d954737 100644
--- a/x11-wm/libcompizconfig/Makefile
+++ b/x11-wm/libcompizconfig/Makefile
@@ -25,8 +25,8 @@ USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomehack intltool libxml2
 
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|'	\
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 6d32099ae804..6ca92bd2cd24 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdockapp
 PORTVERSION=	0.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/
 
@@ -18,12 +18,11 @@ WRKSRC=		${WRKDIR}/${PORTNAME:S/^lib//}-${PORTVERSION}
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xext xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-font --without-examples
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 28669172fa31..b25287512430 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	metacity
 PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,8 +21,8 @@ LIB_DEPENDS=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 
 CONFLICTS=	expocity-[0-9]*
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GETTEXT=	yes
+USE_XORG=	x11 xcomposite xdamage
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index 9e521161e7fc..3c521cef1df1 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -22,7 +22,7 @@ EXPIRATION_DATE=	2007-10-28
 
 USE_IMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		mlvwm.1
 
 MLVWMLIBDIR=	${PREFIX}/lib/X11/mlvwm
diff --git a/x11-wm/novawm/Makefile b/x11-wm/novawm/Makefile
index 9e5e0238b0c2..f99d4de7f8f3 100644
--- a/x11-wm/novawm/Makefile
+++ b/x11-wm/novawm/Makefile
@@ -7,23 +7,21 @@
 
 PORTNAME=	novawm
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	NovaWM-${PORTVERSION}_alpha
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A window manager for X, developed with speed, size, and style in mind
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xpm
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-MAKE_ARGS=	INCLUDES=-I${X11BASE}/include \
+MAKE_ARGS=	INCLUDES=-I${LOCALBASE}/include \
 		CXXFLAGS="${CXXFLAGS} -D_WIN_GNOME_SUPPORT" \
-		novawm_LDFLAGS=-L${X11BASE}/lib
+		novawm_LDFLAGS=-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/novawm
 .if !defined(NOPORTDOCS)
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 96ece32dc424..6f711f183ea7 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -28,7 +28,7 @@ LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 REINPLACE_ARGS= -i ""
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		olvwm.1 olvwmrc.1
 XFREE86_HTML_MAN=	no
 
diff --git a/x11-wm/orion/Makefile b/x11-wm/orion/Makefile
index f40f72485986..510372fc1f43 100644
--- a/x11-wm/orion/Makefile
+++ b/x11-wm/orion/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	orion
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm scheme
 MASTER_SITES=	ftp://ftp.scsh.net/pub/scsh/packages/orion-wm/
 
@@ -17,8 +17,8 @@ COMMENT=	An X11 window manager written in Scheme
 RUN_DEPENDS=	${LOCALBASE}/lib/scsh/0.6/module-system:${PORTSDIR}/devel/sunterlib \
 		${LOCALBASE}/lib/scsh/0.6/scx:${PORTSDIR}/x11-toolkits/scx
 
-USE_X_PREFIX=	yes
 NO_BUILD=	yes
+USE_XORG=	x11
 
 DEPRECATED=		Version branch long since retired
 EXPIRATION_DATE=	2007-10-28
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 5a20c65442d2..74088350b838 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pager
 PORTVERSION=	0.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
@@ -21,7 +21,7 @@ RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
 
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
-USE_XLIB=	yes
+USE_XORG=	x11
 
 SAWFISH_VERSION=	`${LOCALBASE}/bin/sawfish --version 2>&1 | \
 			${SED} 's/^.*version[ ]*\([0-9.]*\).*/\1/'`
diff --git a/x11-wm/pawm/Makefile b/x11-wm/pawm/Makefile
index a432c9ad73e2..98d67c26f571 100644
--- a/x11-wm/pawm/Makefile
+++ b/x11-wm/pawm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pawm
 PORTVERSION=	2.2.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.pleyades.net/pawm/files/
 
@@ -15,14 +15,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Puto Amo Window Manager
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xrandr xrender xpm
 USE_GMAKE=	yes
 MAKEFILE=	Makefile.in
 MAKE_ARGS=	GCC="${CC}" MAKE.binary="${CC} ${LDFLAGS} -o"
 
-CFLAGS+=	-I. -I${X11BASE}/include -DNDEBUG
-LDFLAGS=	-lm -L${X11BASE}/lib -lXpm
+CFLAGS+=	-I. -I${LOCALBASE}/include -DNDEBUG
+LDFLAGS=	-lm -L${LOCALBASE}/lib -lXpm
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-wm/peksystray/Makefile b/x11-wm/peksystray/Makefile
index 07297689d306..ab6b54144543 100644
--- a/x11-wm/peksystray/Makefile
+++ b/x11-wm/peksystray/Makefile
@@ -7,16 +7,15 @@
 
 PORTNAME=	peksystray
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A system tray dockapp similar to the GNOME notification area applet
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 ice sm
 USE_GNOME=	gnometarget
 GNU_CONFIGURE=	yes
 
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 902a574b31ee..a813dacb2e32 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pekwm
 PORTVERSION=	20060417
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://bsd-unix.org/downloads/ \
 		http://pekwm.org/files/
@@ -16,15 +16,13 @@ DISTNAME=	${PORTNAME}-0.1.5
 MAINTAINER=	xcas@cox.net
 COMMENT=	A windowmanager based on aewm++
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_GCC=	3.4
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xft xpm x11
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index d4d6f4f75042..109135ebed4e 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -7,19 +7,17 @@
 
 PORTNAME=	phluid
 PORTVERSION=	0.0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	phluid
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A window manager that emphasizes efficiency, speed, and beauty
 
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lm"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -lm"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 0110cfdedcf4..047c9ca63e28 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	piewm
 PORTVERSION=	1.04
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.crynwr.com/piewm/
 
@@ -16,8 +16,7 @@ COMMENT=	A tvtwm with pie (circular) menus
 
 DISABLE_SIZE=	yes
 USE_IMAKE=	yes
-USE_XPM=	yes
-USE_XORG=	xbitmaps
+USE_XORG=	xbitmaps xpm
 MAN1=		piewm.1
 
 .include <bsd.port.mk>
diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index 9e6373e1e9e1..07c94978d213 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pwm
 PORTVERSION=	2007.07.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://modeemi.fi/~tuomov/dl/ \
 		http://schot.a-eskwadraat.nl/files/
@@ -18,7 +18,7 @@ COMMENT=	A lightweight window manager with emphasis on usability
 
 USE_XORG=	x11
 USE_GMAKE=	yes
-MAKE_ENV=	X11_PREFIX="${X11BASE}" HAS_SYSTEM_ASPRINTF=1
+MAKE_ENV=	X11_PREFIX="${LOCALBASE}" HAS_SYSTEM_ASPRINTF=1
 
 MAN1=		pwm.1x
 
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index 36750c02c204..30f33e79b8c7 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qvwm
 PORTVERSION=	1.1.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
 		ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
@@ -15,9 +15,8 @@ MASTER_SITES=	http://www.csg.is.titech.ac.jp/~kourai/qvwm/archive/qvwm/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Windows 95/98/NT like window manager for X11
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 ice sm xext xpm xscrnsaver
 USE_GNOME=	esound imlib
-USE_XPM=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=		qvwm.1x
diff --git a/x11-wm/ratmen/files/patch-Makefile b/x11-wm/ratmen/files/patch-Makefile
index 9bd308ca0281..771898cf41ad 100644
--- a/x11-wm/ratmen/files/patch-Makefile
+++ b/x11-wm/ratmen/files/patch-Makefile
@@ -17,8 +17,8 @@
 -LIBS   = -L/usr/X11R6/lib -lX11
 -CFLAGS = $(OPTIMIZE) $(WARN) $(DEBUG)
 +CC     ?= gcc
-+LIBS   = -L$(X11BASE)/lib -lX11
-+CFLAGS += $(OPTIMIZE) $(WARN) $(DEBUG) -I$(X11BASE)/include
++LIBS   = -L$(LOCALBASE)/lib -lX11
++CFLAGS += $(OPTIMIZE) $(WARN) $(DEBUG) -I$(LOCALBASE)/include
  
  all: doc $(PROG)
  
diff --git a/x11-wm/ratmenu/files/patch-Makefile b/x11-wm/ratmenu/files/patch-Makefile
index 31b5a8b0cb16..6b18c3c79b0b 100644
--- a/x11-wm/ratmenu/files/patch-Makefile
+++ b/x11-wm/ratmenu/files/patch-Makefile
@@ -11,8 +11,8 @@
 -LIBS   = -L/usr/X11R6/lib -lX11
 -CFLAGS = -Os -Wall -ansi -pedantic
 +MANDIR = $(PREFIX)/man
-+CFLAGS += -I$(X11BASE)/include
-+LIBS = -L$(X11BASE)/lib -lX11
++CFLAGS += -I$(LOCALBASE)/include
++LIBS = -L$(LOCALBASE)/lib -lX11
  
  $(PROG): $(PROG).c
  	$(CC) $(CFLAGS) $< $(LIBS) -o $@
diff --git a/x11-wm/sapphire/files/patch-Makefile b/x11-wm/sapphire/files/patch-Makefile
index 8be0b035b5b8..15cea151ed9a 100644
--- a/x11-wm/sapphire/files/patch-Makefile
+++ b/x11-wm/sapphire/files/patch-Makefile
@@ -12,7 +12,7 @@
 -prefix   = /usr
 -XROOT    = $(prefix)/X11R6
 +prefix   = ${PREFIX}
-+XROOT    = ${X11BASE}
++XROOT    = ${LOCALBASE}
  DESTDIR  =
  INCLUDES = -I$(XROOT)/include
  LDPATH   = -L$(XROOT)/lib
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 1312f214fab5..08511f570cf1 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	sawfish
 PORTVERSION=	1.3.3
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
@@ -24,7 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x1
 GNUHOST=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 PLIST_SUB=	GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
 
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 USE_GNOME=	gnomehier gnomehack esound
 USE_AUTOTOOLS=	autoconf:261:env automake:19:env libtool:15:env
diff --git a/x11-wm/skippy-xd/Makefile b/x11-wm/skippy-xd/Makefile
index 337cb8d23da3..670bdf238b33 100644
--- a/x11-wm/skippy-xd/Makefile
+++ b/x11-wm/skippy-xd/Makefile
@@ -25,7 +25,7 @@ PLIST_DIRS=	%%DATADIR%%
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|; \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \
 		s|/usr/local|${LOCALBASE}|; s|gcc|${CC}|' \
 			${WRKSRC}/Makefile
 post-build:
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index 6c9c07bb5d5e..950e91788718 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -7,16 +7,14 @@
 
 PORTNAME=	skippy
 PORTVERSION=	0.5.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://thegraveyard.org/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A full-screen X11 task-switcher like Apple's Expose
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-
-USE_XLIB=	yes
+USE_XORG=	x11 xext xinerama xft xmu
 USE_BZIP2=	yes
 USE_GNOME=	pkgconfig
 USE_EFL=	imlib2
@@ -26,7 +24,7 @@ PLIST_DIRS=	%%DATADIR%%
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|; \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|; \
 		s|/usr/local|${LOCALBASE}|; s|gcc|${CC}|' \
 			${WRKSRC}/Makefile
 post-build:
diff --git a/x11-wm/swm/Makefile b/x11-wm/swm/Makefile
index 1a880d23b425..a43d3727eb10 100644
--- a/x11-wm/swm/Makefile
+++ b/x11-wm/swm/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	swm
 PORTVERSION=	1.3.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www2.informatik.hu-berlin.de/~sperling/prog/
 EXTRACT_SUFX=	c-src.tgz
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=Window manager for low-memory systems, with title bars and shading
+COMMENT=	Window manager for low-memory systems, with title bars and shading
 
 BINS=		swm swmbg swmswitch
 DOCDIR=		share/doc/${PORTNAME}
@@ -23,8 +23,7 @@ PLIST=		${WRKDIR}/pkg-plist
 PLIST_DIRS=	share/swm/pixmaps share/swm
 SCRIPTS=	startswm
 USE_GMAKE=	yes
-USE_XPM=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext xpm
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 post-patch:
@@ -35,10 +34,10 @@ post-patch:
 .endfor
 
 post-build:
-	cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \
-		-o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${X11BASE}/lib
-	cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${X11BASE}/include *.c \
-	-o ${WRKSRC}/swmswitch -lX11 -L${X11BASE}/lib
+	cd ${WRKSRC}/../swmbg && ${CC} ${CFLAGS} -I${LOCALBASE}/include *.c \
+		-o ${WRKSRC}/swmbg -lX11 -lXext -lXpm -L${LOCALBASE}/lib
+	cd ${WRKSRC}/../swmswitch && ${CC} ${CFLAGS} -I${LOCALBASE}/include *.c \
+	-o ${WRKSRC}/swmswitch -lX11 -L${LOCALBASE}/lib
 
 pre-install:
 	${RM} -f ${PLIST}
diff --git a/x11-wm/swm/files/patch-Makefile-xpm b/x11-wm/swm/files/patch-Makefile-xpm
index 68d8f4f46fe5..96ec2be6ea5b 100644
--- a/x11-wm/swm/files/patch-Makefile-xpm
+++ b/x11-wm/swm/files/patch-Makefile-xpm
@@ -17,7 +17,7 @@
 +#CC			= gcc
  
 -XROOT    = /usr/X11R6
-+XROOT    = $(X11BASE)
++XROOT    = $(LOCALBASE)
  INCLPATH = -I$(XROOT)/include
  LDPATH   = -L$(XROOT)/lib
  
diff --git a/x11-wm/treewm/Makefile b/x11-wm/treewm/Makefile
index b6952647cb49..2aa85bf62c75 100644
--- a/x11-wm/treewm/Makefile
+++ b/x11-wm/treewm/Makefile
@@ -7,26 +7,25 @@
 
 PORTNAME=	treewm
 PORTVERSION=	0.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Manager that arranges the windows in a tree
 
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	xmkmf:${PORTSDIR}/devel/imake
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 ice sm xext xmu xpm xt xxf86vm
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 PORTDOCS=	AUTHORS ChangeLog INSTALL PROBLEMS README README.tiling TODO default.cfg sample.cfg
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/Makefile
 
 post-build:
 	@${SED} 's|%%D%%|${DOCSDIR}|g' ${PKGDIR}/pkg-message >${PKGMESSAGE}
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 48732b78a7a5..573cd140ec57 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -18,8 +18,7 @@ COMMENT=	Twm with a virtual desktop
 
 WRKSRC=		${WRKDIR}/tvtwm
 USE_IMAKE=	yes
-USE_XPM=	yes
-USE_XORG=	xbitmaps
+USE_XORG=	xbitmaps xpm
 MAN1=		tvtwm.1
 MANCOMPRESSED=	no
 PLIST_FILES=	bin/tvtwm
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 56ae1d7bd445..61c56c4d8d47 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	ude
 PORTVERSION=	0.2.9b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	udeproject
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,8 +17,7 @@ COMMENT=	Small, fast, compact windowmanager
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 ice sm xext xmu xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11-wm/waimea-devel/Makefile b/x11-wm/waimea-devel/Makefile
index 93e376e86f49..beec3e3390d2 100644
--- a/x11-wm/waimea-devel/Makefile
+++ b/x11-wm/waimea-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	waimea
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://dev.gentoo.org/~nixphoeni/ \
 		${MASTER_SITE_LOCAL}
@@ -24,7 +24,7 @@ LATEST_LINK=	${PORTNAME}-devel
 USE_AUTOTOOLS=	automake:19:env
 USE_GMAKE=	yes
 USE_ICONV=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 4061481c1a01..65ed428d082c 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -7,19 +7,17 @@
 
 PORTNAME=	waimea
 PORTVERSION=	0.4.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	waimea
+MASTER_SITES=	SF
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An X11 window manager designed for maximum efficiency
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	${LOCALBASE}/bin/Esetroot:${PORTSDIR}/x11/eterm
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	xft
 USE_PERL5_RUN=	yes
 
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/wampager/Makefile b/x11-wm/wampager/Makefile
index 416e64cf70b5..8f6c89aa57bd 100644
--- a/x11-wm/wampager/Makefile
+++ b/x11-wm/wampager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wampager
 PORTVERSION=	0.9.3.20041204
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.ijs.si/~lesi/waimea/ \
 		http://www.daemon.li/distfiles/
@@ -17,8 +17,8 @@ COMMENT=	A mini pager for the waimea window manager
 
 PLIST_FILES=	bin/wampager
 
+USE_XORG=	x11 xext xpm ice
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
 
 .include <bsd.port.mk>
diff --git a/x11-wm/weewm/Makefile b/x11-wm/weewm/Makefile
index 79a5f3c82069..de3e7232fcfb 100644
--- a/x11-wm/weewm/Makefile
+++ b/x11-wm/weewm/Makefile
@@ -19,7 +19,7 @@ PLIST_FILES=	bin/weewm
 USE_XORG=	x11
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,^CC=,CC?=,' -e 's,/usr/X11R6,${X11BASE},g' \
+	@${REINPLACE_CMD} -e 's,^CC=,CC?=,' -e 's,/usr/X11R6,${LOCALBASE},g' \
 		${WRKSRC}/src/Makefile
 
 do-install:
diff --git a/x11-wm/windowlab/Makefile b/x11-wm/windowlab/Makefile
index c0e21ee1bad5..0983ddcfa358 100644
--- a/x11-wm/windowlab/Makefile
+++ b/x11-wm/windowlab/Makefile
@@ -29,7 +29,7 @@ PORTDOCS=	CHANGELOG README
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,^CC =,CC ?=,' \
-		-e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Makefile
+		-e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/windowlab ${PREFIX}/bin
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index bcf1d092b72f..637b449e1bd3 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	ungif.5:${PORTSDIR}/graphics/libungif \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
-RUN_DEPENDS=	${X11BASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
+RUN_DEPENDS=	${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:${PORTSDIR}/graphics/wmicons
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 8ad102ee0c3b..1ce20a00caa6 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wm2
 PORTVERSION=	4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.all-day-breakfast.com/wm2/
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
@@ -15,9 +15,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A very simple window manager for X
 
-BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}
+BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext xmu
 ALL_TARGET=	depend wm2
 
 do-install:
diff --git a/x11-wm/wm2/files/patch-aa b/x11-wm/wm2/files/patch-aa
index a9e723ad4b0c..819ef9e6114c 100644
--- a/x11-wm/wm2/files/patch-aa
+++ b/x11-wm/wm2/files/patch-aa
@@ -3,7 +3,7 @@
 @@ -1,9 +1,10 @@
  
 -LIBS	=  -L/usr/X11/lib -lXext -lX11 -lXmu -lm
-+LIBS	=  -L$(PREFIX)/lib -lXext -lX11 -lXmu -lm
++LIBS	=  -L$(LOCALBASE)/lib -lXext -lX11 -lXmu -lm
 +LIBS	+= -Wl,-rpath,$(PREFIX)/lib
  
 -CC	= gcc
@@ -11,7 +11,7 @@
 -CFLAGS	= -O2
 +CC	?= gcc
 +CCC	= $(CXX)
-+CFLAGS	+= -I$(PREFIX)/include
++CFLAGS	+= -I$(LOCALBASE)/include
  OBJECTS	= Border.o Buttons.o Client.o Events.o Main.o Manager.o Rotated.o
  
  .c.o:
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 58383397bb6c..e62e271cadbe 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -39,7 +39,7 @@ post-patch:
 	@${REINPLACE_CMD} -e '/chmod 0/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E '/\/usr\/share/d; \
 			      s|/usr/local|${LOCALBASE}|g ; \
-		 	      s|/usr/X11R6|${X11BASE}|g; \
+		 	      s|/usr/X11R6|${LOCALBASE}|g; \
 			      s|(share/pixmaps.*),|\1|g' \
 		${WRKSRC}/data/WMWmakerconf*
 .for file in data/po/ja.po po/ja.po
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index d910165c2b01..09fc45e04a9f 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmanager
 PORTVERSION=	0.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}.orig
@@ -19,7 +19,8 @@ LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext
+USE_GL=		gl
 USE_GMAKE=	yes
 MAKE_ENV=	CXX="${CXX}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/x11-wm/wmanager/files/patch-aa b/x11-wm/wmanager/files/patch-aa
index 25944fb2ab25..982b0eddc1c0 100644
--- a/x11-wm/wmanager/files/patch-aa
+++ b/x11-wm/wmanager/files/patch-aa
@@ -11,8 +11,8 @@ $FreeBSD$
 +bindir	= $(PREFIX)/bin
 +incdir	= ./inc
 +srcdir	= ./src
-+fltkinc	= $(X11BASE)/include
-+x11lib	= $(X11BASE)/lib
++fltkinc	= $(LOCALBASE)/include
++x11lib	= $(LOCALBASE)/lib
  
  # compiler settings
 -CXX       = g++ 
diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile
index e5a1a30e001c..56c374854cdb 100644
--- a/x11-wm/wmcp/Makefile
+++ b/x11-wm/wmcp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmcp
 PORTVERSION=	1.2.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm windowmaker
 MASTER_SITES=	http://web.cs.mun.ca/~gstarkes/wmaker/dockapps/files/
 
@@ -15,8 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dockable pager for Window Maker
 
 PLIST_FILES=	bin/wmcp
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	x11 xext xpm
 ALL_TARGET=	clean wmcp
 
 do-install:
diff --git a/x11-wm/wmcp/files/patch-aa b/x11-wm/wmcp/files/patch-aa
index 5465a9235164..4069cab7c087 100644
--- a/x11-wm/wmcp/files/patch-aa
+++ b/x11-wm/wmcp/files/patch-aa
@@ -5,8 +5,8 @@
  
 -INCLUDES =-I/usr/X11R6/include/X11 -I/usr/local/include -I/usr/include/X11R6/X11
 -LIBINC =-L/usr/X11R6/lib -L/usr/include/lib
-+INCLUDES = -I${X11BASE}/include/X11 -I${X11BASE}/include
-+LIBINC = -L${X11BASE}/lib
++INCLUDES = -I${LOCALBASE}/include/X11 -I${LOCALBASE}/include
++LIBINC = -L${LOCALBASE}/lib
  LIBS = -lm -lX11 -lXpm -lXext
  
  TARGET  = wmcp
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 3635142cd74a..3f2ebaff75c0 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	wmg
 PORTVERSION=	0.15.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm gnome
 MASTER_SITES=	http://ductape.net/~reeve/downloads/
 DISTNAME=	wmG-${PORTVERSION}
@@ -15,8 +15,7 @@ DISTNAME=	wmG-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small GTK-based GNOME-compliant window manager
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index e18ae5119100..1edc2d48a485 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wmii
 DISTVERSION=	3.6
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.suckless.org/download/
 
@@ -18,10 +19,10 @@ RUN_DEPENDS=	dmenu:${PORTSDIR}/x11/dmenu \
 		${LOCALBASE}/9/bin/rc:${PORTSDIR}/devel/9base
 
 USE_ICONV=	yes
-USE_XLIB=	yes
+USE_XORG=	x11 xextproto xt xext
 
 MAKE_ARGS=	PREFIX="${PREFIX}" INCLUDE="${LOCALBASE}/include" \
-		INCX11="-I${X11BASE}/include" LIBX11="-L${X11BASE}/lib" \
+		INCX11="-I${LOCALBASE}/include" LIBX11="-L${LOCALBASE}/lib" \
 		CC="${CC} -c" LD="${CC}" LIBIXP="-lixp" STATIC="" \
 		LIBICONV="-liconv" MAN="${MANPREFIX}/man"
 
diff --git a/x11-wm/xcompmgr/Makefile b/x11-wm/xcompmgr/Makefile
index ba10407ebd7e..2cda5526cc7f 100644
--- a/x11-wm/xcompmgr/Makefile
+++ b/x11-wm/xcompmgr/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	xcompmgr
 PORTVERSION=	1.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://xapps.freedesktop.org/release/
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	A sample X compositing manager
 
-USE_XLIB=	yes
+USE_XORG=	x11 xcomposite xfixes xdamage xrender
 GNU_CONFIGURE=	yes
 
 MAN1=		xcompmgr.1
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index cffcab261228..afd479cb3153 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	xfce
 PORTVERSION=	3.8.18
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm xfce
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CDE like desktop with GTK
@@ -18,7 +17,7 @@ COMMENT=	CDE like desktop with GTK
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
 USE_GCC=	4.1
-USE_XORG=	x11
+USE_XORG=	x11 xpm
 USE_GETTEXT=	yes
 USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
@@ -28,7 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--with-conf-dir=${PREFIX}/etc/xfce \
 		--with-data-dir=${PREFIX}/share/xfce \
 		--with-locale-dir=${PREFIX}/share/locale \
-		--with-xpm=${X11BASE} \
+		--with-xpm=${LOCALBASE} \
 		--enable-gtk-engine=${PREFIX}/lib/gtk/themes/engines \
 		--disable-arts \
 		--enable-taskbar \
@@ -43,13 +42,13 @@ MAN1=		glob.1 xfbd.1 xfce.1 xfclock.1 xfglob.1 xfgnome.1 xfhelp.1 \
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_XFT)
-LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
+USE_XORG=	xft
 CONFIGURE_ARGS+=	--enable-xft
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${LOCALBASE}|g' ${WRKSRC}/other/xinitrc.in
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/other/xinitrc.in
 	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
 	@${REINPLACE_CMD} -e 's|/opt/kde3|${LOCALBASE}|g ; \
 		s|/opt/gnome|${LOCALBASE}|g' ${WRKSRC}/xfmenu/xfmenu.c
diff --git a/x11-wm/xfce/files/patch-other::xinitrc.in b/x11-wm/xfce/files/patch-other::xinitrc.in
index 75df757baabd..66f1710673f6 100644
--- a/x11-wm/xfce/files/patch-other::xinitrc.in
+++ b/x11-wm/xfce/files/patch-other::xinitrc.in
@@ -5,7 +5,7 @@
  
  # Launch xscreensaver (if available)
 -xscreensaver -no-splash &
-+XBINDIR=%%X11BASE%%/bin
++XBINDIR=%%LOCALBASE%%/bin
 +if [ -x $XBINDIR/xscreensaver ]; then
 +	xscreensaver -no-splash &
 +fi
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 1fe745504309..392ad280adb9 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.4.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 DIST_SUBDIR=	xfce4
@@ -26,6 +26,7 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libgui libmcs libutil mcsmanager
+USE_XORG=	x11 sm ice
 
 MAN1=		xfce4-session.1 xfce4-session-logout.1
 
diff --git a/x11-wm/xmonad-contrib/Makefile b/x11-wm/xmonad-contrib/Makefile
index 505fd8a35e37..651f6dc75560 100644
--- a/x11-wm/xmonad-contrib/Makefile
+++ b/x11-wm/xmonad-contrib/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmonad-contrib
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad-contrib/${PORTVERSION}/
 
@@ -19,7 +20,7 @@ BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 RUN_DEPENDS=	xmonad:${PORTSDIR}/x11-wm/xmonad
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
-USE_XLIB=	yes
+USE_XORG=	x11
 
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
 GHC_VERSION=	6.8.2
diff --git a/x11-wm/xmonad/Makefile b/x11-wm/xmonad/Makefile
index a5fd4b2b4f91..7a317d8f0b61 100644
--- a/x11-wm/xmonad/Makefile
+++ b/x11-wm/xmonad/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmonad
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	x11-wm haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmonad/${PORTVERSION}/
 
@@ -17,7 +18,7 @@ BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-x11-ghc>=1.4.1:${PORTSDIR}/x11/hs-x11-ghc
 LIB_DEPENDS=	gmp.7:${PORTSDIR}/math/libgmp4
 
-USE_XLIB=	yes
+USE_XORG=	x11
 
 CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
 GHC_VERSION=	6.8.2
diff --git a/x11-wm/yawm/Makefile b/x11-wm/yawm/Makefile
index 2e01528776b8..87c7a2d49290 100644
--- a/x11-wm/yawm/Makefile
+++ b/x11-wm/yawm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	yawm
 PORTVERSION=	0.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	ftp://ftp.sai.msu.su/pub/X11/win_man/
 DISTNAME=	yawm-0.0.1-a4
@@ -18,7 +18,7 @@ COMMENT=	Has title bars, iconizing, maximizing, taskbar, placement, clock
 GNU_CONFIGURE=	yes
 PLIST=		${WRKDIR}/pkg-plist
 #USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 DOCS=		AUTHORS COPYING ChangeLog
 
 DEPRECATED=	project no longer exists
diff --git a/x11/9box/Makefile b/x11/9box/Makefile
index 6e97349b015b..7374d81e40b2 100644
--- a/x11/9box/Makefile
+++ b/x11/9box/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	9box
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	thierry
@@ -16,15 +16,13 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	9box can "pack" windows inside itself
 
 PLIST_FILES=	bin/9box
-USE_XLIB=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_XORG=	xbitmaps
+USE_XORG=	xbitmaps x11 xt
 
 BUILD_WRKSRC=	${WRKSRC}/src
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g; \
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
 		s|%%CC%%|${CC}|g' \
 		${WRKSRC}/src/Makefile
 
diff --git a/x11/9box/files/patch-src::Makefile b/x11/9box/files/patch-src::Makefile
index 68e2c34d4905..654ee9c50f60 100644
--- a/x11/9box/files/patch-src::Makefile
+++ b/x11/9box/files/patch-src::Makefile
@@ -2,8 +2,8 @@
 +++ src/Makefile	Wed Jul 23 21:35:39 2003
 @@ -1,10 +1,14 @@
 +CC=		%%CC%%
-+CFLAGS+=	-g -I. -I%%X11BASE%%/include
-+LIBS+=		-L%%X11BASE%%/lib -lX11
++CFLAGS+=	-g -I. -I%%LOCALBASE%%/include
++LIBS+=		-L%%LOCALBASE%%/lib -lX11
 +
  all:	9box
  
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index df8fafa24b29..46c6cf6eebb4 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -32,6 +32,6 @@ MANCOMPRESSED=	yes
 
 do-build:
 	cd ${WRKSRC} && \
-	${CC} ${CFLAGS} -I${X11BASE}/include -L${X11BASE}/lib -lX11 -o 9menu 9menu.c
+	${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -o 9menu 9menu.c
 
 .include <bsd.port.mk>
diff --git a/x11/9term/files/patch-ad b/x11/9term/files/patch-ad
index 4a9f0f3cc3f4..46e5a7b8bf66 100644
--- a/x11/9term/files/patch-ad
+++ b/x11/9term/files/patch-ad
@@ -20,7 +20,7 @@
 -CFLAGS=-g $(OS) $(INCLUDES) -fno-builtin -D_LIBXG_EXTENSION
 -LDFLAGS=-g -R/usr/openwin/lib -L/usr/openwin/lib -R/usr/ucblib -L/usr/ucblib
 -CC=gcc
-+INCLUDES=-I. -I../libtext -I$(SAMPATH)/include -I${X11BASE}/include
++INCLUDES=-I. -I../libtext -I$(SAMPATH)/include -I${LOCALBASE}/include
 +CFLAGS+= $(OS) $(INCLUDES)
 +LDFLAGS=
 +CC?=gcc
@@ -31,8 +31,8 @@
 -XLIBS=-lXt -lX11
 -
 +LIBS=../libtext/libtext.a $(SAMPATH)/libframe/libframe.a $(SAMPATH)/libXg/libXg.a
-+XLIBS= -lXt -lX11 -L${X11BASE}/lib
-+XLIBS+=-Wl,-rpath,$(X11BASE)/lib
++XLIBS= -lXt -lX11 -L${LOCALBASE}/lib
++XLIBS+=-Wl,-rpath,$(LOCALBASE)/lib
  OBJECTS=9term.o command.o display.o pty.o
  
  $(TARGET): $(OBJECTS)
diff --git a/x11/accessx/Makefile b/x11/accessx/Makefile
index e1fa1647fd84..2cbf41a4b118 100644
--- a/x11/accessx/Makefile
+++ b/x11/accessx/Makefile
@@ -25,8 +25,8 @@ PLIST_FILES=	bin/ax bin/accessx
 post-patch:
 	${REINPLACE_CMD} \
 		-e "s@/usr/local@${PREFIX}@" \
-		-e "s@/usr/X11R6/lib@${X11BASE}/lib@" \
-		-e "s@g\+\+@${CXX} ${CXXFLAGS} -I${X11BASE}/include@g" \
+		-e "s@/usr/X11R6/lib@${LOCALBASE}/lib@" \
+		-e "s@g\+\+@${CXX} ${CXXFLAGS} -I${LOCALBASE}/include@g" \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s@wish -f@${WISH} -f@g" ${WRKSRC}/accessx
 
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index 252e0e60a91b..a25eee72d760 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -9,16 +9,15 @@ PORTNAME=	alltray
 PORTVERSION=	0.69
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Dock any application with no native tray icon
 
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib"
+USE_LDCONFIG=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 USE_GCC=	3.4+
 
 MAN1=		alltray.1
diff --git a/x11/apwal/Makefile b/x11/apwal/Makefile
index 31a0f5f7d1d3..ed7db46c86f4 100644
--- a/x11/apwal/Makefile
+++ b/x11/apwal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	apwal
 PORTVERSION=	0.4.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://apwal.free.fr/download/
 
@@ -15,7 +15,6 @@ MAINTAINER=	vs@FreeBSD.org
 COMMENT=	Simple and powerful application launcher
 
 USE_GNOME=	gtk20 libxml2
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile
index 744be93ca492..8439e4ff3632 100644
--- a/x11/aterm/Makefile
+++ b/x11/aterm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	aterm
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 CATEGORIES+=	x11	# `+=' is for slave ports
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	A color vt102 terminal emulator with transparency support
@@ -22,7 +21,7 @@ CONFIGURE_ARGS+=	--enable-transparency \
 			--enable-fading --enable-utmp --enable-wtmp \
 			--without-afterstep-config
 
-CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 .if !defined(WITHOUT_BACKGROUND_IMAGE)
 LIB_DEPENDS+=	AfterImage.0:${PORTSDIR}/graphics/libafterimage
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index 1e00081f5b26..d4a8d0208bcd 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bbrun
 PORTVERSION=	1.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11
 MASTER_SITES=	http://www.bsd-geek.de/FreeBSD/distfiles/
 
@@ -16,6 +16,7 @@ COMMENT=	A Run box for Blackbox
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
 
+USE_XORG=	xpm
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/x11/bbrun/files/patch-Makefile b/x11/bbrun/files/patch-Makefile
index e5733a7ff1aa..7040172a6f27 100644
--- a/x11/bbrun/files/patch-Makefile
+++ b/x11/bbrun/files/patch-Makefile
@@ -5,7 +5,7 @@
 -LIBDIR = -L/usr/lib -L/usr/X11R6/lib
 -LIBS   = -lXpm `pkg-config --libs gtk+-2.0`
 -CFLAGS = `pkg-config --cflags gtk+-2.0`
-+LIBDIR = -L${LOCALBASE}/lib -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
 +LIBS   = -lXpm `pkg-config --libs gtk+-2.0` ${LDFLAGS}
 +CFLAGS += `pkg-config --cflags gtk+-2.0`
  
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 925cf1a0baa5..b9a86699d710 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -22,7 +22,7 @@ MAN1=		blast.1
 PLIST_FILES=	bin/blast
 
 do-build:
-	${CC} ${CFLAGS} ${WRKSRC}/blast.c -I${X11BASE}/include -L${X11BASE}/lib -lX11 -lXext -o ${WRKSRC}/blast
+	${CC} ${CFLAGS} ${WRKSRC}/blast.c -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -lXext -o ${WRKSRC}/blast
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/blast ${PREFIX}/bin/blast
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index d6be0fa327db..b2717a657c8a 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Quick start up utility for applications on an X display
 
 USE_IMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		bricons.1
 
 .include <bsd.port.pre.mk>
diff --git a/x11/brightside/Makefile b/x11/brightside/Makefile
index c5d91513b4f8..821de0548824 100644
--- a/x11/brightside/Makefile
+++ b/x11/brightside/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	brightside
 PORTVERSION=	1.4.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://files.catmur.co.uk/brightside/
 
@@ -15,7 +15,7 @@ MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	A tool to add reactivity to the edges and corners of the GNOME desktop
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xt
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomeprefix gnomehack libwnck libgnomeui
diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile
index 16cd71274730..d38b5a5980a0 100644
--- a/x11/buttonbox/Makefile
+++ b/x11/buttonbox/Makefile
@@ -23,8 +23,8 @@ PLIST=		${WRKDIR}/pkg-plist
 USE_XORG=	x11 xext
 
 do-build:
-	cd ${WRKSRC} && ${CC} ${CFLAGS} -o buttonbox -L${X11BASE}/lib \
-		-I${X11BASE}/include -lX11 -lXext button.c configuration.c \
+	cd ${WRKSRC} && ${CC} ${CFLAGS} -o buttonbox -L${LOCALBASE}/lib \
+		-I${LOCALBASE}/include -lX11 -lXext button.c configuration.c \
 		colour.c dispatcher.c main.c
 
 pre-install:
@@ -39,8 +39,8 @@ pre-install:
 .endif
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/ButtonBox.ad ${X11BASE}/lib/X11/app-defaults/
-	${INSTALL_PROGRAM} ${WRKSRC}/buttonbox ${X11BASE}/bin/
+	${INSTALL_DATA} ${WRKSRC}/ButtonBox.ad ${LOCALBASE}/lib/X11/app-defaults/
+	${INSTALL_PROGRAM} ${WRKSRC}/buttonbox ${LOCALBASE}/bin/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/${DOCDIR}
 	for i in ${DOCS}; \
diff --git a/x11/cnslock/files/patch-Makefile b/x11/cnslock/files/patch-Makefile
index 3be3a2a6dd1c..25a254705210 100644
--- a/x11/cnslock/files/patch-Makefile
+++ b/x11/cnslock/files/patch-Makefile
@@ -19,7 +19,7 @@
  
  kleds.o: kleds.c include/kleds.h include/defines.h
 -	$(CC) -Wall -I/usr/X11R6/include -c kleds.c -o kleds.o
-+	$(CC) -Wall -I$(X11BASE)/include -c kleds.c -o kleds.o
++	$(CC) -Wall -I$(LOCALBASE)/include -c kleds.c -o kleds.o
  
  cnslock: $(OBJS)
  	$(CC) -o cnslock $(OBJS) $(LIBS)
diff --git a/x11/decurs/Makefile b/x11/decurs/Makefile
index d0bbdf5c1555..95599a5f6514 100644
--- a/x11/decurs/Makefile
+++ b/x11/decurs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	decurs
 PORTVERSION=	0.55.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	http://varg.dyndns.org/psi/files/
 
@@ -16,7 +16,7 @@ COMMENT=	A GTK+ based program that lets you edit you XFree86 mouse cursors
 
 LIB_DEPENDS=	gtkmm-2.0.6:${PORTSDIR}/x11-toolkits/gtkmm20
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GNOME=	gnometarget gtk20
 GNU_CONFIGURE=	yes
 
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index e11e1fba7b64..fc62165f6bce 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -20,6 +20,6 @@ USE_GNOME=	gtk12
 USE_GMAKE=	yes
 
 post-install:
-	${STRIP_CMD} ${X11BASE}/bin/deskmenu
+	${STRIP_CMD} ${PREFIX}/bin/deskmenu
 
 .include <bsd.port.mk>
diff --git a/x11/deskmenu/files/patch-Makefile b/x11/deskmenu/files/patch-Makefile
index 3f3804f39a25..573a7cf09ff9 100644
--- a/x11/deskmenu/files/patch-Makefile
+++ b/x11/deskmenu/files/patch-Makefile
@@ -5,7 +5,7 @@
 -CFLAGS    = -g -O2 -Wall `gtk-config --cflags`
 -XROOT     = /usr/X11
 +CFLAGS    = -g -O2 -Wall `gtk12-config --cflags`
-+XROOT     = ${X11BASE}
++XROOT     = ${LOCALBASE}
  INCLUDES  = -I$(XROOT)/include
 -LIBS      = -lX11 `gtk-config --libs`
 +LIBS      = -lX11 `gtk12-config --libs`
diff --git a/x11/dmenu/files/patch-config.mk b/x11/dmenu/files/patch-config.mk
index fac9f79fda0e..b4f1c9a1cd99 100644
--- a/x11/dmenu/files/patch-config.mk
+++ b/x11/dmenu/files/patch-config.mk
@@ -11,8 +11,8 @@
  
 -X11INC = /usr/X11R6/include
 -X11LIB = /usr/X11R6/lib
-+X11INC = $(X11BASE)/include
-+X11LIB = $(X11BASE)/lib
++X11INC = $(LOCALBASE)/include
++X11LIB = $(LOCALBASE)/lib
  
  # includes and libs
  INCS = -I. -I/usr/include -I${X11INC}
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index 569274e3f1e0..4206e50f4062 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -23,7 +23,7 @@ USE_GNOME=	gnometarget
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lzo-lib=${LOCALBASE}
-MAKE_ARGS=	CPPFLAGS="-I. -I${X11BASE}/include"
+MAKE_ARGS=	CPPFLAGS="-I. -I${LOCALBASE}/include"
 
 MAN1=		dxpc.1
 PLIST_FILES=	bin/dxpc
diff --git a/x11/ebuttons/Makefile b/x11/ebuttons/Makefile
index 196d62691af2..c4648428e21d 100644
--- a/x11/ebuttons/Makefile
+++ b/x11/ebuttons/Makefile
@@ -24,8 +24,8 @@ WRKSRC=		${WRKDIR}/E-buttons
 USE_GL=	gl
 USE_EFL=	imlib2
 
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lepplet -lGL -lImlib2 ${PTHREAD_LIBS}
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -lepplet -lGL -lImlib2 ${PTHREAD_LIBS}
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o E-Buttons.epplet \
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index 9dfd50b121d2..fde64fd064a6 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -34,8 +34,8 @@ USE_XORG=	x11 xau xdmcp xext xi xrandr xv sm ice
 MAN1=		electricsheep.1
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
+		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 LIBTOOLFILES=	configure mpeg2dec/configure flam3/configure
 
@@ -52,7 +52,7 @@ pre-everything::
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/usr/X11R6/lib/xscreensaver/config|${X11BASE}/share/xscreensaver/config|' \
+		's|/usr/X11R6/lib/xscreensaver/config|${LOCALBASE}/share/xscreensaver/config|' \
 		${WRKSRC}/Makefile.in
 
 	@${REINPLACE_CMD} -e \
diff --git a/x11/emu/Makefile b/x11/emu/Makefile
index 40801ef47941..5a9b2f80d820 100644
--- a/x11/emu/Makefile
+++ b/x11/emu/Makefile
@@ -15,8 +15,8 @@ MASTER_SITE_SUBDIR=	applications
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A terminal emulator for the X Window System
 
-BUILD_DEPENDS=	xrdb:${X_CLIENTS_PORT}
-RUN_DEPENDS=	xrdb:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
+RUN_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 
 USE_IMAKE=	yes
 USE_DISPLAY=	yes
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index f9237401a6b5..41087835cdc4 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -23,8 +23,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GL=	gl
 USE_EFL=	imlib2
-CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
 
 do-build:
 	cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} -o ${PORTNAME}.epplet \
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 9a6fceab9aab..59672432e3d3 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	eterm
 PORTVERSION=	0.9.4
 PORTREVISION=	4
 CATEGORIES+=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	Eterm-${PORTVERSION}
 
 MAINTAINER?=	olgeni@FreeBSD.org
@@ -28,7 +27,7 @@ CONFIGURE_ARGS?=--enable-trans --enable-utmp \
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 OPTIONS=	MMX	"With MMX instruction set" off
-USE_XLIB=	yes
+USE_XORG=	x11 xt
 USE_ICONV=	yes
 USE_EFL=	imlib2
 
diff --git a/x11/fast-user-switch-applet/Makefile b/x11/fast-user-switch-applet/Makefile
index 9c96e26c8e4c..4a3790058257 100644
--- a/x11/fast-user-switch-applet/Makefile
+++ b/x11/fast-user-switch-applet/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	fast-user-switch-applet
 PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -15,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Fast user switching applet for GNOME
 
+USE_XORG=	x11
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix gtk20 gnomepanel
diff --git a/x11/fbpanel/Makefile b/x11/fbpanel/Makefile
index 4a8df934b84c..ad2d4c806ef4 100644
--- a/x11/fbpanel/Makefile
+++ b/x11/fbpanel/Makefile
@@ -7,15 +7,15 @@
 
 PORTNAME=	fbpanel
 PORTVERSION=	4.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@fsck.ch
 COMMENT=	Desktop panel that includes a taskbar, pager, launchbar and more
 
+USE_XORG=	x11 xmu xpm
 USE_GNOME=	gtk20
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index 9d369e28f91a..27946f35794e 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -20,7 +20,7 @@ NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 do-install:
-		${MKDIR} ${X11BASE}/icons
-		( cd ${X11BASE}/icons; ${TAR} --no-same-owner --no-same-permissions -xzf ${DISTDIR}/fbsd-icons.tar.gz )
+		${MKDIR} ${PREFIX}/icons
+		( cd ${PREFIX}/icons; ${TAR} --no-same-owner --no-same-permissions -xzf ${DISTDIR}/fbsd-icons.tar.gz )
 
 .include <bsd.port.mk>
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index 0245b8b79ace..9603aefa77eb 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -18,8 +18,8 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/GL" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/GL" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \
 		--with-confdir=${LOCALBASE}/share/xscreensaver/config
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/x11/fireflies/files/patch-Make.include.in b/x11/fireflies/files/patch-Make.include.in
index 9369f93aefad..059278411157 100644
--- a/x11/fireflies/files/patch-Make.include.in
+++ b/x11/fireflies/files/patch-Make.include.in
@@ -6,8 +6,8 @@
  
 -CFLAGS = -Wall -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
 -LIBS = ../libgfx/src/libgfx.a $(GL_LIBS) $(SDL_LIBS) $(OPT_LIBS) @LIBS@
-+CFLAGS = -Wall -I$(X11BASE)/include -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
-+LIBS = ../libgfx/src/libgfx.a $(SDL_LIBS) $(OPT_LIBS) -L$(X11BASE)/lib $(GL_LIBS) @LIBS@ 
++CFLAGS = -Wall -I$(LOCALBASE)/include -I../libgfx/include/ $(SDL_CFLAGS) @CFLAGS@
++LIBS = ../libgfx/src/libgfx.a $(SDL_LIBS) $(OPT_LIBS) -L$(LOCALBASE)/lib $(GL_LIBS) @LIBS@ 
  
  OBJECTS = arrow.o bait.o firefly.o scene.o tail.o utils.o modes.o @OPT_OBJS@
  PROGRAM = @PROGRAM@
diff --git a/x11/fluxbg/Makefile b/x11/fluxbg/Makefile
index 3505498d487c..7293fa1c8153 100644
--- a/x11/fluxbg/Makefile
+++ b/x11/fluxbg/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	fluxbg
 PORTVERSION=	0.7
 PORTREVISION=	7
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Background changer for fluxbox/blackbox
@@ -22,14 +21,13 @@ USE_GNOME=	gnomehack gnometarget
 
 .include <bsd.port.pre.mk>
 
-.if !exists(${LOCALBASE}/bin/fbsetbg) && \
-    !exists(${X11BASE}/bin/fbsetbg)
+.if !exists(${LOCALBASE}/bin/fbsetbg)
 RUN_DEPENDS=	fbsetbg:${PORTSDIR}/x11-wm/fluxbox
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-		s|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/src/fluxbg_conf.cc
+		s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/src/fluxbg_conf.cc
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index 00ae77a33076..92115f9ddfef 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -26,8 +26,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 DOCS=		AUTHORS COPYING ChangeLog INSTALL TODO
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c
 
 .ifndef (NOPORTDOCS)
 post-install:
diff --git a/x11/gcursor/files/patch-src::gcursor.c b/x11/gcursor/files/patch-src::gcursor.c
index 583eac0fd36d..5161e1e3b34a 100644
--- a/x11/gcursor/files/patch-src::gcursor.c
+++ b/x11/gcursor/files/patch-src::gcursor.c
@@ -10,7 +10,7 @@
 -	"/usr/local/share/icons/",
 -	"/usr/share/icons/",
 +	"%%LOCALBASE%%/lib/X11/icons/",
-+	"%%X11BASE%%/lib/X11/icons/",
++	"%%LOCALBASE%%/lib/X11/icons/",
  	"%s/.icons/",
  	NULL
  };	
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index eb847c8bd191..58a4db01d84b 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-applets
 PORTVERSION=	2.22.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -27,7 +27,6 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends-2.0.pc:${PORTS
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 INSTALLS_OMF=	yes
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 52d1f30f022c..8c70a9c524c8 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-libs
 PORTVERSION=	1.4.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs/1.4
@@ -21,8 +21,7 @@ BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
-USE_XPM=	yes
+USE_XORG=	xpm ice x11
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix esound gtk12 imlib libxml orbit
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 890725c65e56..1edd00ae1268 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.22.1.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -25,7 +25,6 @@ LIB_DEPENDS=	gweather.1:${PORTSDIR}/net/libgweather \
     		polkit-gnome.0:${PORTSDIR}/sysutils/policykit-gnome
 
 USE_GETTEXT=	yes
-USE_XLIB=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 602fca757c63..94fd144c23e8 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.22.2
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -19,7 +20,6 @@ LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify
 RUN_DEPENDS=	xscreensaver-gl-helper:${PORTSDIR}/x11/xscreensaver-gnome-hacks
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome-swallow/Makefile b/x11/gnome-swallow/Makefile
index 1e0197417784..4f5f0fd301fa 100644
--- a/x11/gnome-swallow/Makefile
+++ b/x11/gnome-swallow/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gnome-swallow
 PORTVERSION=	1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://interreality.org/~tetron/technology/swallow/
 
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Applet that swallows any X11 application into the GNOME 2 panel
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomepanel
 GNU_CONFIGURE=	yes
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index deba7104b9bd..09e7f7578229 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	2.22.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,7 +19,6 @@ COMMENT=	Terminal component for the GNOME 2 Desktop
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 INSTALLS_OMF=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui vte gnomedocutils
 GNU_CONFIGURE=	yes
diff --git a/x11/gpctool/Makefile b/x11/gpctool/Makefile
index b1c01a737229..408d644605f9 100644
--- a/x11/gpctool/Makefile
+++ b/x11/gpctool/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	gpc:${PORTSDIR}/devel/libgpc	\
 USE_ZIP=	yes
 USE_GL=		yes
 PLIST_FILES=	bin/gpctool
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 NO_CDROM=	Can't be used for profit without permission
 
 MAKEFILE=	${FILESDIR}/BSDmakefile
diff --git a/x11/gpctool/files/BSDmakefile b/x11/gpctool/files/BSDmakefile
index 42365dfae84f..957862277916 100644
--- a/x11/gpctool/files/BSDmakefile
+++ b/x11/gpctool/files/BSDmakefile
@@ -6,9 +6,9 @@ SRCS=		gpctool.c main.c callbacks.c graphics.c psdump.c
 
 BINDIR=		${PREFIX}/bin
 WARNS?=		2
-CFLAGS+=	-I${X11BASE}/include/X11 -I${X11BASE}/include
+CFLAGS+=	-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include
 CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${X11BASE}/lib -lformsGL -lGLU
+LDFLAGS+=	-L${LOCALBASE}/lib -lformsGL -lGLU
 LDFLAGS+=	-L${LOCALBASE}/lib -lgpc -lm
 
 .include <bsd.prog.mk>
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index 6c0e09fe2b1c..8e2c852bbee5 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -33,6 +33,6 @@ post-install:
 
 .include <bsd.port.pre.mk>
 
-RUN_DEPENDS+=	${X11BASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/synaptics
+RUN_DEPENDS+=	${LOCALBASE}/lib/xorg/modules/input/synaptics_drv.so:${PORTSDIR}/x11-drivers/synaptics
 
 .include <bsd.port.post.mk>
diff --git a/x11/gtk-themepreview/Makefile b/x11/gtk-themepreview/Makefile
index cf33fd9aad22..0bf342e50de6 100644
--- a/x11/gtk-themepreview/Makefile
+++ b/x11/gtk-themepreview/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-themepreview
 PORTVERSION=	2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_LOCAL}	# http://www.users.monornet.hu/linux/files/
 MASTER_SITE_SUBDIR=	danfe
@@ -17,7 +17,6 @@ MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	A small application for preview your theme widgets in one small window
 
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_AUTOTOOLS=	automake:19:env
 
diff --git a/x11/gtkchtheme/Makefile b/x11/gtkchtheme/Makefile
index 3201461099e6..e4e5bd72a298 100644
--- a/x11/gtkchtheme/Makefile
+++ b/x11/gtkchtheme/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtkchtheme
 PORTVERSION=	0.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://plasmasturm.org/code/gtk-chtheme/
 DISTNAME=	gtk-chtheme-${PORTVERSION}
@@ -16,7 +16,6 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK2 theme changer
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20
 
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 975b37108866..c07439e0b9a8 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient \
 		usb-0.1:${PORTSDIR}/devel/libusb
@@ -33,7 +33,7 @@ USE_OPENSSL=	yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 SUB_FILES=	kdm pkg-deinstall pkg-install pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -45,8 +45,8 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
-		--with-qt-dir=${X11BASE}	\
-		--with-xdmdir=${X11BASE}/lib/X11/xdm \
+		--with-qt-dir=${LOCALBASE}	\
+		--with-xdmdir=${LOCALBASE}/lib/X11/xdm \
 		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
diff --git a/x11/kde4-baseapps/files/pkg-message.in b/x11/kde4-baseapps/files/pkg-message.in
index 34663a8e2907..dfc3f83e715e 100644
--- a/x11/kde4-baseapps/files/pkg-message.in
+++ b/x11/kde4-baseapps/files/pkg-message.in
@@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts
 $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
-/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and
+/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and
 restarting the X-server.
 
 You also have to make the new path known to fontconfig by
@@ -15,6 +15,6 @@ adding a
 
 <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either
 
-%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
+%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
 
 fc-cache -f (as root if you edited local.conf) afterwards.
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 975b37108866..c07439e0b9a8 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient \
 		usb-0.1:${PORTSDIR}/devel/libusb
@@ -33,7 +33,7 @@ USE_OPENSSL=	yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 SUB_FILES=	kdm pkg-deinstall pkg-install pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -45,8 +45,8 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
-		--with-qt-dir=${X11BASE}	\
-		--with-xdmdir=${X11BASE}/lib/X11/xdm \
+		--with-qt-dir=${LOCALBASE}	\
+		--with-xdmdir=${LOCALBASE}/lib/X11/xdm \
 		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
diff --git a/x11/kde4-runtime/files/pkg-message.in b/x11/kde4-runtime/files/pkg-message.in
index 34663a8e2907..dfc3f83e715e 100644
--- a/x11/kde4-runtime/files/pkg-message.in
+++ b/x11/kde4-runtime/files/pkg-message.in
@@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts
 $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
-/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and
+/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and
 restarting the X-server.
 
 You also have to make the new path known to fontconfig by
@@ -15,6 +15,6 @@ adding a
 
 <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either
 
-%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
+%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
 
 fc-cache -f (as root if you edited local.conf) afterwards.
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 975b37108866..c07439e0b9a8 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient \
 		usb-0.1:${PORTSDIR}/devel/libusb
@@ -33,7 +33,7 @@ USE_OPENSSL=	yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 SUB_FILES=	kdm pkg-deinstall pkg-install pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -45,8 +45,8 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
-		--with-qt-dir=${X11BASE}	\
-		--with-xdmdir=${X11BASE}/lib/X11/xdm \
+		--with-qt-dir=${LOCALBASE}	\
+		--with-xdmdir=${LOCALBASE}/lib/X11/xdm \
 		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
diff --git a/x11/kde4-workspace/files/pkg-message.in b/x11/kde4-workspace/files/pkg-message.in
index 34663a8e2907..dfc3f83e715e 100644
--- a/x11/kde4-workspace/files/pkg-message.in
+++ b/x11/kde4-workspace/files/pkg-message.in
@@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts
 $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
-/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and
+/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and
 restarting the X-server.
 
 You also have to make the new path known to fontconfig by
@@ -15,6 +15,6 @@ adding a
 
 <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either
 
-%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
+%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
 
 fc-cache -f (as root if you edited local.conf) afterwards.
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 975b37108866..c07439e0b9a8 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient \
 		usb-0.1:${PORTSDIR}/devel/libusb
@@ -33,7 +33,7 @@ USE_OPENSSL=	yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 SUB_FILES=	kdm pkg-deinstall pkg-install pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -45,8 +45,8 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
-		--with-qt-dir=${X11BASE}	\
-		--with-xdmdir=${X11BASE}/lib/X11/xdm \
+		--with-qt-dir=${LOCALBASE}	\
+		--with-xdmdir=${LOCALBASE}/lib/X11/xdm \
 		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
diff --git a/x11/kdebase3/files/pkg-message.in b/x11/kdebase3/files/pkg-message.in
index 34663a8e2907..dfc3f83e715e 100644
--- a/x11/kdebase3/files/pkg-message.in
+++ b/x11/kdebase3/files/pkg-message.in
@@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts
 $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
-/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and
+/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and
 restarting the X-server.
 
 You also have to make the new path known to fontconfig by
@@ -15,6 +15,6 @@ adding a
 
 <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either
 
-%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
+%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
 
 fc-cache -f (as root if you edited local.conf) afterwards.
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 975b37108866..c07439e0b9a8 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient \
 		usb-0.1:${PORTSDIR}/devel/libusb
@@ -33,7 +33,7 @@ USE_OPENSSL=	yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 SUB_FILES=	kdm pkg-deinstall pkg-install pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -45,8 +45,8 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
-		--with-qt-dir=${X11BASE}	\
-		--with-xdmdir=${X11BASE}/lib/X11/xdm \
+		--with-qt-dir=${LOCALBASE}	\
+		--with-xdmdir=${LOCALBASE}/lib/X11/xdm \
 		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
diff --git a/x11/kdebase4-runtime/files/pkg-message.in b/x11/kdebase4-runtime/files/pkg-message.in
index 34663a8e2907..dfc3f83e715e 100644
--- a/x11/kdebase4-runtime/files/pkg-message.in
+++ b/x11/kdebase4-runtime/files/pkg-message.in
@@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts
 $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
-/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and
+/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and
 restarting the X-server.
 
 You also have to make the new path known to fontconfig by
@@ -15,6 +15,6 @@ adding a
 
 <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either
 
-%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
+%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
 
 fc-cache -f (as root if you edited local.conf) afterwards.
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 975b37108866..c07439e0b9a8 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient \
 		usb-0.1:${PORTSDIR}/devel/libusb
@@ -33,7 +33,7 @@ USE_OPENSSL=	yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 SUB_FILES=	kdm pkg-deinstall pkg-install pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -45,8 +45,8 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
-		--with-qt-dir=${X11BASE}	\
-		--with-xdmdir=${X11BASE}/lib/X11/xdm \
+		--with-qt-dir=${LOCALBASE}	\
+		--with-xdmdir=${LOCALBASE}/lib/X11/xdm \
 		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
diff --git a/x11/kdebase4-workspace/files/pkg-message.in b/x11/kdebase4-workspace/files/pkg-message.in
index 34663a8e2907..dfc3f83e715e 100644
--- a/x11/kdebase4-workspace/files/pkg-message.in
+++ b/x11/kdebase4-workspace/files/pkg-message.in
@@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts
 $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
-/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and
+/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and
 restarting the X-server.
 
 You also have to make the new path known to fontconfig by
@@ -15,6 +15,6 @@ adding a
 
 <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either
 
-%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
+%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
 
 fc-cache -f (as root if you edited local.conf) afterwards.
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 975b37108866..c07439e0b9a8 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -18,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Basic applications for the KDE system
 
 RUN_DEPENDS=	${KDE_PREFIX}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env
-BUILD_DEPENDS=	xmkmf:${X_IMAKE_PORT}
+BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
 		smbclient:${PORTSDIR}/net/samba-libsmbclient \
 		usb-0.1:${PORTSDIR}/devel/libusb
@@ -33,7 +33,7 @@ USE_OPENSSL=	yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 SUB_FILES=	kdm pkg-deinstall pkg-install pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
@@ -45,8 +45,8 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
 CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
-		--with-qt-dir=${X11BASE}	\
-		--with-xdmdir=${X11BASE}/lib/X11/xdm \
+		--with-qt-dir=${LOCALBASE}	\
+		--with-xdmdir=${LOCALBASE}/lib/X11/xdm \
 		--with-ssl-dir=${OPENSSLBASE}
 
 OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on \
diff --git a/x11/kdebase4/files/pkg-message.in b/x11/kdebase4/files/pkg-message.in
index 34663a8e2907..dfc3f83e715e 100644
--- a/x11/kdebase4/files/pkg-message.in
+++ b/x11/kdebase4/files/pkg-message.in
@@ -7,7 +7,7 @@ $ xset fp+ %%PREFIX%%/share/apps/konsole/fonts
 $ xset fp rehash
 
 or by adding it to your X-server configuration file (usually
-/etc/X11/xorg.conf or %%X11BASE%%/lib/X11/xorg.conf) and
+/etc/X11/xorg.conf or %%LOCALBASE%%/lib/X11/xorg.conf) and
 restarting the X-server.
 
 You also have to make the new path known to fontconfig by
@@ -15,6 +15,6 @@ adding a
 
 <dir>%%PREFIX%%/share/apps/konsole/fonts</dir> line to either
 
-%%X11BASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
+%%LOCALBASE%%/etc/fonts/local.conf or ~/.fonts.conf and running
 
 fc-cache -f (as root if you edited local.conf) afterwards.
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index c08c1a99290a..49baf9dcdcee 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -62,14 +62,14 @@ CONFIGURE_ARGS+=--disable-ltdl-install	\
 		--disable-as-needed \
 		--enable-mt \
 		--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--with-libthai=yes \
+		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \
 		--with-lua=no \
 		--with-ssl-dir=${OPENSSLBASE}
 CONFIGURE_ENV+=	libltdl_cv_shlibext=".so"
 
-FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir
+FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
+FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index c08c1a99290a..49baf9dcdcee 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -62,14 +62,14 @@ CONFIGURE_ARGS+=--disable-ltdl-install	\
 		--disable-as-needed \
 		--enable-mt \
 		--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--with-libthai=yes \
+		--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \
 		--with-lua=no \
 		--with-ssl-dir=${OPENSSLBASE}
 CONFIGURE_ENV+=	libltdl_cv_shlibext=".so"
 
-FONTSCALE=	${X11BASE}/lib/X11/fonts/TTF/luximb.ttf
-FONTENCOD=	${X11BASE}/lib/X11/fonts/encodings/encodings.dir
+FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
+FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 55cfa13164ac..4d4008098153 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -22,7 +22,7 @@ USE_XORG=	x11
 PKGMESSAGE=	${WRKSRC}/pkg-message
 
 post-patch:
-	@${PERL} -pi -e 's,%%X11BASE%%,${X11BASE},g' ${WRKSRC}/Makefile
+	@${PERL} -pi -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/example_rc ${EXAMPLESDIR}/keylaunch.rc
 
 post-install:
-	@${SED} -e 's;/usr/X11R6;${PREFIX};g' < ${FILESDIR}/pkg-message.in > \
+	@${SED} -e 's;/usr/X11R6;${LOCALBASE};g' < ${FILESDIR}/pkg-message.in > \
 		${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/x11/keylaunch/files/patch-Makefile b/x11/keylaunch/files/patch-Makefile
index adbf494bb8dd..eafcf1b6863e 100644
--- a/x11/keylaunch/files/patch-Makefile
+++ b/x11/keylaunch/files/patch-Makefile
@@ -4,7 +4,7 @@
 -CC        = gcc
 -CFLAGS    = -g -O2 -Wall
 -XROOT     = /usr/X11
-+XROOT     = %%X11BASE%%
++XROOT     = %%LOCALBASE%%
  INCLUDES  = -I$(XROOT)/include
  LIBS      = -lX11 
  LDPATH    = -L$(XROOT)/lib
diff --git a/x11/kxgenerator/Makefile b/x11/kxgenerator/Makefile
index 97ed7b15e1f0..7d87bc7125ed 100644
--- a/x11/kxgenerator/Makefile
+++ b/x11/kxgenerator/Makefile
@@ -23,7 +23,7 @@ INSTALLS_ICONS=	yes
 
 pre-configure:
 .for i in properties.h main.cpp
-	@${REINPLACE_CMD} -e "s:/usr/lib/xorg:${X11BASE}/lib:g"	\
+	@${REINPLACE_CMD} -e "s:/usr/lib/xorg:${LOCALBASE}/lib:g"	\
 		${WRKSRC}/src/${i}
 .endfor
 
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index bb5baf630641..03cfadbd3231 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=	--enable-xdmauth --datadir=${PREFIX}/lib
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_XCB)
-BUILD_DEPENDS+=	${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS+=	${BUILD_DEPENDS}
 CONFIGURE_ARGS+=	--with-xcb=yes
 PLIST_SUB+=	XCB=""
diff --git a/x11/libXtrans/Makefile b/x11/libXtrans/Makefile
index 132bdd2884e5..c7685dd4f59b 100644
--- a/x11/libXtrans/Makefile
+++ b/x11/libXtrans/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Network API translation layer for X applications and libraries
 
 USE_BZIP2=	yes
-PREFIX?=	${X11BASE}
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index c0e075afbd67..885e902479fe 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A library for writing custom applets for GNOME Control Center
 USE_BZIP2=	yes
 USE_GNOME=	gnomelibs
 USE_LDCONFIG=	yes
-MAKE_ENV=	X11BASE="${LOCALBASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/libcapplet/files/patch-Makefile b/x11/libcapplet/files/patch-Makefile
index 72fec2549c4f..e3f3e1d7fdcb 100644
--- a/x11/libcapplet/files/patch-Makefile
+++ b/x11/libcapplet/files/patch-Makefile
@@ -1,19 +1,20 @@
---- Makefile.orig	Wed Jul 10 08:32:05 2002
-+++ Makefile	Wed Oct  4 15:35:57 2006
+--- Makefile.orig	2002-07-10 14:32:05.000000000 +0200
++++ Makefile	2008-04-12 14:10:37.000000000 +0200
 @@ -7,14 +7,14 @@
  SRCS=	capplet-widget-libs.c capplet-widget.c capplet-widget-libs.h \
  	capplet-widget.h control-center-common.c control-center-skels.c \
  	control-center-stubs.c control-center.h
 -CFLAGS+=-I. -I${X11BASE}/include -I${X11BASE}/include/gtk12 \
 -	-I${X11BASE}/include/gnome-1.0 -I${LOCALBASE}/include \
-+CFLAGS+=-I. -I${X11BASE}/include -I${LOCALBASE}/include/gtk12 \
++CFLAGS+=-I. -I${LOCALBASE}/include -I${LOCALBASE}/include/gtk12 \
 +	-I${LOCALBASE}/include/gnome-1.0 -I${LOCALBASE}/include \
  	-I${LOCALBASE}/include/glib12 -I${LOCALBASE}/include/orbit-1.0
- LDADD+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \
+-LDADD+=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lORBitCosNaming -lORBit -lIIOP \
 -	-lORBitutil -lglib12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \
 -	-lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 \
 -	-lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl \
 -	-lesd -lgnugetopt -laudiofile 
++LDADD+=	-L${LOCALBASE}/lib -lORBitCosNaming -lORBit -lIIOP \
 +	-lORBitutil -lglib-12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \
 +	-lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 \
 +	-lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl \
diff --git a/x11/libcapplet/files/patch-cappletConf.sh.in b/x11/libcapplet/files/patch-cappletConf.sh.in
index ee73029fd555..b146abff2089 100644
--- a/x11/libcapplet/files/patch-cappletConf.sh.in
+++ b/x11/libcapplet/files/patch-cappletConf.sh.in
@@ -1,9 +1,10 @@
---- cappletConf.sh.in.orig	Wed Jul 10 08:42:31 2002
-+++ cappletConf.sh.in	Sat Oct  7 15:03:42 2006
+--- cappletConf.sh.in.orig	2002-07-10 14:42:31.000000000 +0200
++++ cappletConf.sh.in	2008-04-12 14:12:31.000000000 +0200
 @@ -1,4 +1,4 @@
- CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib"
+-CAPPLET_LIBDIR="-Wl,-E -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib"
 -CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 -lgdk12 -lgmodule12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib12 -lwrap -lm -lgnorba"
 -CAPPLET_INCLUDEDIR="-I%%X11BASE%%/include/libcapplet1 -I%%X11BASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%X11BASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%X11BASE%%/include/gtk12"
++CAPPLET_LIBDIR="-Wl,-E -L%%LOCALBASE%%/lib"
 +CAPPLET_LIBS="-lcapplet -Wl,-E -lXpm -ljpeg -lgnomeui -lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk-12 -lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl -lesd -lgnugetopt -laudiofile -lm -lglib-12 -L%%LOCALBASE%%/lib -lORBitCosNaming -lORBit -lIIOP -lORBitutil -lglib-12 -lwrap -lm -lgnorba"
-+CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%X11BASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12"
++CAPPLET_INCLUDEDIR="-I%%LOCALBASE%%/include/libcapplet1 -I%%LOCALBASE%%/include/gnome-1.0 -I%%LOCALBASE%%/include -DNEED_GNOMESUPPORT_H -I%%LOCALBASE%%/lib/gnome-libs/include -I%%LOCALBASE%%/include/glib12 -I%%LOCALBASE%%/include/orbit-1.0 -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gtk12"
  MODULE_VERSION="capplet-1.4.0.5"
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index b5acfccfdeb6..cf351e3cb370 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdnd
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://leb.net/offix/
 DISTNAME=	dnd.${PORTVERSION}
@@ -16,10 +16,12 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drag and drop library
 
-USE_XLIB=	yes
+USE_XORG=	x11 xmu ice xaw
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/DND/DNDlib
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/" \
+		LDFLAGS="-L${LOCALBASE}/lib/"
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/x11/libdnd/files/patch-ab b/x11/libdnd/files/patch-ab
index 08ad036d4c93..550691b8906c 100644
--- a/x11/libdnd/files/patch-ab
+++ b/x11/libdnd/files/patch-ab
@@ -4,7 +4,7 @@
  RANLIB = @RANLIB@
  
  LIBS = @LIBS@ @X_LIBS@ @X_PRE_LIBS@ -lXmu -lXaw -lXt -lX11 @X_EXTRA_LIBS@
-+LIBS+=		-Wl,-rpath,$(X11BASE)/lib
++LIBS+=		-Wl,-rpath,$(LOCALBASE)/lib
 +SHLDFLAGS=	-shared -x -soname $@
 +DNDLIB=		libDnd.so.1
 +DNDPLUSLIB=	libDnd++.so.1
diff --git a/x11/libgnome-java/Makefile b/x11/libgnome-java/Makefile
index a9fb6b590f43..0c706096cd40 100644
--- a/x11/libgnome-java/Makefile
+++ b/x11/libgnome-java/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnome-java
 PORTVERSION=	2.12.7
+PORTREVISION=	1
 CATEGORIES=	x11 java
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
@@ -20,7 +21,6 @@ BUILD_DEPENDS=	${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/
 RUN_DEPENDS=	${JAVALIBDIR}/gtk${GTK_API_VERSION}.jar:${PORTSDIR}/x11-toolkits/libgtk-java
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/libgnomemm/Makefile b/x11/libgnomemm/Makefile
index 6c64242effc7..880ea98daf87 100644
--- a/x11/libgnomemm/Makefile
+++ b/x11/libgnomemm/Makefile
@@ -7,10 +7,9 @@
 
 PORTNAME=	libgnomemm
 PORTVERSION=	2.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gtkmm
+MASTER_SITES=	SF/gtkmm
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	bland@FreeBSD.org
@@ -20,11 +19,10 @@ LIB_DEPENDS=	gtkmm-2.0:${PORTSDIR}/x11-toolkits/gtkmm20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_AUTOTOOLS=	libtool:15
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack libgnome
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
 .include <bsd.port.mk>
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 7ea6c53d4e2c..6660c199ddac 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libgnomemm
 PORTVERSION=	2.22.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,9 +23,8 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 LATEST_LINK=	libgnomemm26
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
+USE_XORG=	xext
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 USE_GNOME=	gnomehack libgnome
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index dbe0ac3e30a6..5d155a961406 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libsx
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	libraries
@@ -19,7 +19,7 @@ COMMENT=	Simple X11 library
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_XORG=	x11
+USE_XORG=	x11 xext xmu xt
 ALL_TARGET=	src freq
 
 do-install:
diff --git a/x11/libsx/files/patch-aa b/x11/libsx/files/patch-aa
index 0183076a064c..f412ab17ba0c 100644
--- a/x11/libsx/files/patch-aa
+++ b/x11/libsx/files/patch-aa
@@ -14,7 +14,7 @@
  #  CFLAGS = -g -D_POSIX_SOURCE -DOPENGL_SUPPORT
  #
 -CFLAGS = -g -D_POSIX_SOURCE 
-+CFLAGS += -O -D_POSIX_SOURCE -I$(X11BASE)/include
++CFLAGS += -O -D_POSIX_SOURCE -I$(LOCALBASE)/include
  
  #
  # if you are on a System V (like the SGI) machine, just define RANLIB
@@ -34,5 +34,5 @@
  #LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
 -LIBS   =  $(LIBSX) -lXaw -lXmu -lXt -lX11
 -
-+LIBS   =  $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(X11BASE)/lib
-+LIBS+=	-Wl,-rpath,${X11BASE}/lib
++LIBS   =  $(LIBSX) -lXaw3d -lXmu -lXt -lX11 -lm -lXext -L$(LOCALBASE)/lib
++LIBS+=	-Wl,-rpath,${LOCALBASE}/lib
diff --git a/x11/libsynaptics/Makefile b/x11/libsynaptics/Makefile
index 4f3b35267702..d93afa68638a 100644
--- a/x11/libsynaptics/Makefile
+++ b/x11/libsynaptics/Makefile
@@ -16,12 +16,12 @@ MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Library to access the Xorg/XFree86 Synaptics TouchPad Driver
 
 USE_BZIP2=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/%%PTHREAD_LIBS%%/${PTHREAD_LIBS}/g' \
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 060c2039e0f3..42874b5bd4af 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -8,9 +8,10 @@
 
 PORTNAME=	libxklavier
 PORTVERSION=	3.5
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -18,7 +19,7 @@ COMMENT=	An utility library to make XKB stuff easier
 
 RUN_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 
-USE_XLIB=	yes
+USE_XORG=	x11 xkbfile
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gnomehack libxml2 glib20
 USE_LDCONFIG=	yes
diff --git a/x11/linux-f10-xorg-libs/Makefile b/x11/linux-f10-xorg-libs/Makefile
index bae9faa45884..5b60f1b85ecb 100644
--- a/x11/linux-f10-xorg-libs/Makefile
+++ b/x11/linux-f10-xorg-libs/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=		linux-XFree86-libs
 
 USE_LINUX_RPM=		yes
 LINUX_DIST_VER=		4
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 
 SRC_DISTFILES=		xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm
 
diff --git a/x11/linux-f8-xorg-libs/Makefile b/x11/linux-f8-xorg-libs/Makefile
index bae9faa45884..5b60f1b85ecb 100644
--- a/x11/linux-f8-xorg-libs/Makefile
+++ b/x11/linux-f8-xorg-libs/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=		linux-XFree86-libs
 
 USE_LINUX_RPM=		yes
 LINUX_DIST_VER=		4
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 
 SRC_DISTFILES=		xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm
 
diff --git a/x11/linux-xorg-libs/Makefile b/x11/linux-xorg-libs/Makefile
index bae9faa45884..5b60f1b85ecb 100644
--- a/x11/linux-xorg-libs/Makefile
+++ b/x11/linux-xorg-libs/Makefile
@@ -21,7 +21,7 @@ CONFLICTS=		linux-XFree86-libs
 
 USE_LINUX_RPM=		yes
 LINUX_DIST_VER=		4
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 
 SRC_DISTFILES=		xorg-x11-6.8.2-37.FC4.49.2.1.src.rpm
 
diff --git a/x11/lxpanel/Makefile b/x11/lxpanel/Makefile
index aa877d51d2ae..01c30c82ba89 100644
--- a/x11/lxpanel/Makefile
+++ b/x11/lxpanel/Makefile
@@ -7,19 +7,20 @@
 
 PORTNAME=	lxpanel
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	lxde
 
 MAINTAINER=	b89605222@ntu.edu.tw
 COMMENT=	LXPanel is a lightweight X11 desktop panel
 
+USE_XORG=	x11 xmu
 USE_GNOME=	gtk20 gnomelibs gnomedesktop
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	automake:19
 CONFIGURE_ARGS=	--prefix=${PREFIX}
-CONFIGURE_ENV=	LDFLAGS="-L${X11BASE}/lib" CFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" CFLAGS="-I${LOCALBASE}/include"
 CFLAGS+=	-I${WRKSRC}
 USE_GMAKE=	yes
 
diff --git a/x11/metisse/Makefile b/x11/metisse/Makefile
index 849979ae3373..b6bfe1fdfc65 100644
--- a/x11/metisse/Makefile
+++ b/x11/metisse/Makefile
@@ -17,7 +17,7 @@ COMMENT=	An innovative X-based window system
 CONFLICTS=	fvwm-1.* fvwm-2.5.*
 
 LIB_DEPENDS=	Nucleo.0:${PORTSDIR}/x11-toolkits/nucleo
-RUN_DEPENDS=	${X11BASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts
+RUN_DEPENDS=	${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts
 
 BROKEN=		Does not compile
 
@@ -26,7 +26,7 @@ PATCH_STRIP=	-p1
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-fontdir=${X11BASE}/lib/X11/fonts
+CONFIGURE_ARGS=	--with-fontdir=${LOCALBASE}/lib/X11/fonts
 MAKE_ARGS=	METISSE_DOC_DIR="${DOCSDIR}"
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 7561e9adbb35..27b983b6eb8b 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrxvt-devel
 PORTVERSION=	0.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	materm
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--enable-xim --enable-cjk --with-encoding=eucj
 .endif
 
 .if defined(WITH_XFT)
-LIB_DEPENDS+=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+USE_XORG+=	xft
 CONFIGURE_ARGS+=	--enable-xft
 .endif
 
@@ -113,8 +113,8 @@ CONFIGURE_ARGS+=	--with-atab-extra=${EXTRA_ATAB_HEIGHT:M[0-9]*}
 CONFIGURE_ARGS+=	--with-tab-radius=${TAB_RADIUS:M[0-9]*}
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
-		LIBS="${LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+		LIBS="${LIBS} -L${LOCALBASE}/lib"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mrxvt ${PREFIX}/bin
diff --git a/x11/multi-aterm/Makefile b/x11/multi-aterm/Makefile
index 18018c17f8ba..c73e21ca94bb 100644
--- a/x11/multi-aterm/Makefile
+++ b/x11/multi-aterm/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A multi terminal based on aterm
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-		--with-xpm=${X11BASE}
+		--with-xpm=${LOCALBASE}
 
 DOCS=		AUTHORS ChangeLog INSTALL TODO
 MAN1=		multi-aterm.1
diff --git a/x11/numlockx/Makefile b/x11/numlockx/Makefile
index e4213ee0714a..435a05d86d6f 100644
--- a/x11/numlockx/Makefile
+++ b/x11/numlockx/Makefile
@@ -21,6 +21,6 @@ USE_XORG=	x11 xext
 PLIST_FILES=	bin/numlockx
 
 # Needed for the "configure" program to find XTest and XKB header files
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"
 
 .include <bsd.port.mk>
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index fdd8a5209d04..94d37ecf94ab 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -129,7 +129,7 @@ post-patch: .SILENT
 pre-su-install:
 # XXX This port silently assumes PREFIX == X11BASE XXX
 	@${MKDIR} ${PREFIX}/${MODULESDIR}/drivers
-# xorg-server-1.4 installs its own ${X11BASE}/lib/xorg/modules/libwfb.so,
+# xorg-server-1.4 installs its own ${LOCALBASE}/lib/xorg/modules/libwfb.so,
 # so back it up so it can be later restored similarly to what NVidia does:
 .if ${NVVERSION} >= 974600
 	@${MV} -f ${PREFIX}/${MODULESDIR}/libwfb.so \
diff --git a/x11/nvidia-driver/files/patch-lib::Makefile b/x11/nvidia-driver/files/patch-lib::Makefile
index 453550ee24f3..35cd61c4f485 100644
--- a/x11/nvidia-driver/files/patch-lib::Makefile
+++ b/x11/nvidia-driver/files/patch-lib::Makefile
@@ -2,7 +2,7 @@
 +++ lib/Makefile	Wed Jun 22 19:12:16 2005
 @@ -6,7 +6,7 @@
  FIND_DIRS=	/usr/lib	\
- 		${X11BASE}/lib
+ 		${LOCALBASE}/lib
  
 -.if exists(/compat/linux)
 +.if exists(/compat/linux) && !defined(WITHOUT_LINUX)
diff --git a/x11/nvidia-settings/Makefile b/x11/nvidia-settings/Makefile
index 718424d4d301..fae698cb5c7f 100644
--- a/x11/nvidia-settings/Makefile
+++ b/x11/nvidia-settings/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nvidia-settings
 PORTVERSION=	1.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_NVIDIA:S,$,XFree86/${PORTNAME}/,} \
 		${MASTER_SITE_LOCAL:S,$,bland/,}
@@ -15,23 +15,23 @@ MASTER_SITES=	${MASTER_SITE_NVIDIA:S,$,XFree86/${PORTNAME}/,} \
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Display Control Panel for X NVidia driver
 
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
 USE_GL=		gl
+USE_XORG=	xv
 
 PLIST_FILES=	bin/nvidia-settings
 MAN1=		nvidia-settings.1
 
 MAKE_ENV=	ROOT=${PREFIX} \
 		CC=${CC} \
-		X11R6_LIB_DIR=${X11BASE}/lib \
-		X11R6_INC_DIR=${X11BASE}/include \
+		X11R6_LIB_DIR=${LOCALBASE}/lib \
+		X11R6_INC_DIR=${LOCALBASE}/include \
 		LDFLAGS="${PTHREAD_LIBS}"
 
 pre-build:
 	cd ${WRKSRC}/src/libXNVCtrl; \
-	${CC} -c -I${X11BASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \
+	${CC} -c -I${LOCALBASE}/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO \
 		-DXTHREADS -DXUSE_MTSAFE_API -DMALLOC_0_RETURNS_NULL NVCtrl.c; \
 	${RM} -f libXNVCtrl.a; \
 	ar clq libXNVCtrl.a NVCtrl.o; \
diff --git a/x11/p5-X11-GUITest/Makefile b/x11/p5-X11-GUITest/Makefile
index 620098a7f102..3ea01d572f12 100644
--- a/x11/p5-X11-GUITest/Makefile
+++ b/x11/p5-X11-GUITest/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	X11-GUITest
 PORTVERSION=	0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${MASTER_SITE_SOURCEFORGE:S/$/:sf/}
@@ -20,11 +20,11 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:cpan,sf
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Provides GUI testing/interaction facilities
 
-USE_XLIB=	yes
+USE_XORG=	x11 xt xext xtst
 PERL_CONFIGURE=	5.8.0+
 MAN3=	X11::GUITest.3
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,/usr/X11R6,${X11BASE},g" ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e "s,/usr/X11R6,${LOCALBASE},g" ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/x11/p5-X11-IdleTime/Makefile b/x11/p5-X11-IdleTime/Makefile
index a23175ea708f..05faeee2fac1 100644
--- a/x11/p5-X11-IdleTime/Makefile
+++ b/x11/p5-X11-IdleTime/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	${SITE_PERL}/Inline.pm:${PORTSDIR}/devel/p5-Inline \
     		${SITE_PERL}/${PERL_ARCH}/version.pm:${PORTSDIR}/devel/p5-version
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-USE_XLIB=	yes
+USE_XORG=	x11 xscrnsaver
 PERL_CONFIGURE=	5.8.0+
 
 MANPREFIX=	${SITE_PERL}
@@ -26,7 +26,7 @@ MAN3=		X11::IdleTime.3
 
 post-patch:
 .for i in IdleTime.pm
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' ${WRKSRC}/${i}
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/${i}
 	@${PERL} -pi -e "s,[\d\.]+,${PORTVERSION:C/0./0.0/}, if m{VERSION}" ${WRKSRC}/${i}
 .endfor
 
diff --git a/x11/padkey/Makefile b/x11/padkey/Makefile
index c647ce89b09c..10ce75a02623 100644
--- a/x11/padkey/Makefile
+++ b/x11/padkey/Makefile
@@ -20,7 +20,7 @@ PLIST_FILES=	bin/padkey
 PORTDOCS=	CREDITS README
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6/|${X11BASE}/|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/X11R6/|${LOCALBASE}/|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/padkey ${PREFIX}/bin/padkey
diff --git a/x11/portoseguro/Makefile b/x11/portoseguro/Makefile
index 589e756a79b6..1a93349afc3b 100644
--- a/x11/portoseguro/Makefile
+++ b/x11/portoseguro/Makefile
@@ -25,7 +25,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
 .for i in portoseguro portoseguro.conf
-	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${X11BASE}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${LOCALBASE}/bin
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 06e4d83afd71..8ca258127742 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -22,7 +22,7 @@ USE_IMAKE=	yes
 MAKE_ARGS=	INFOFILES=""
 
 post-install:
-		${MKDIR} ${X11BASE}/lib/X11/locale/C/props; \
-		${INSTALL_DATA} ${WRKSRC}/C/* ${X11BASE}/lib/X11/locale/C/props
+		${MKDIR} ${PREFIX}/lib/X11/locale/C/props; \
+		${INSTALL_DATA} ${WRKSRC}/C/* ${PREFIX}/lib/X11/locale/C/props
 
 .include <bsd.port.mk>
diff --git a/x11/qrash/Makefile b/x11/qrash/Makefile
index b7d67d9b3714..bcc3af61e288 100644
--- a/x11/qrash/Makefile
+++ b/x11/qrash/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	qrash
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://qmg.org/files/demos/qmg/ \
 		ftp://qmg.org/pub/demos/qmg/ \
@@ -24,7 +24,7 @@ ONLY_FOR_ARCHS=	i386
 USE_GCC=	2.95
 USE_GMAKE=	yes
 USE_PERL5=	yes	# XXX
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 ALL_TARGET=	qrash
 
diff --git a/x11/qrash/files/patch-ae b/x11/qrash/files/patch-ae
index 8fbb3aa9c4ef..7c956d627c69 100644
--- a/x11/qrash/files/patch-ae
+++ b/x11/qrash/files/patch-ae
@@ -3,7 +3,7 @@
 @@ -1,10 +1,10 @@
  # Maximum optimization
 -CXXFLAGS += -O6 -ffast-math -funroll-loops -w
-+CXXFLAGS += -I$(X11BASE)/include -ffast-math -funroll-loops
++CXXFLAGS += -I$(LOCALBASE)/include -ffast-math -funroll-loops
  
  # Debugging options
  #CXXFLAGS += -g
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index 8acef763b634..03c8e786e561 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	opengl
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=0
+PORTREVISION=	1
 CATEGORIES?=	x11
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -25,8 +25,8 @@ QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-USE_GL=		yes
-USE_XLIB=	yes
+USE_GL=		glu
+USE_XORG=	x11
 
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index f15c3304afd1..e669ed30c98f 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -24,7 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-utmp --enable-wtmp --enable-languages \
 		--with-xpm --enable-xpm-background --enable-transparency \
 		--enable-shared
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 MAN1=		rxvt.1
 
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index 6f21e23bdab7..ba80b7eb93e1 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -19,14 +19,12 @@ COMMENT=	A clone of the terminal emulator rxvt modified to support Unicode
 PATCH_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Encode/HanExtra.pm:${PORTSDIR}/chinese/p5-Encode-HanExtra \
 		${SITE_PERL}/${PERL_ARCH}/Encode/JIS2K.pm:${PORTSDIR}/converters/p5-Encode-JIS2K
 .endif
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
 
-USE_XORG=		xpm
+USE_GNOME=	pkgconfig
+USE_XORG=		xpm xft
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV=		CPPFLAGS="-I${X11BASE}/include"
-CONFIGURE_ARGS=		--enable-shared --enable-everything --with-term=rxvt		\
-			--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include"
+CONFIGURE_ARGS=		--enable-shared --enable-everything --with-term=rxvt
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_BZIP2=		yes
 
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index a9d596e40af2..5398d126ef70 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -21,8 +21,8 @@ USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-utmp --enable-wtmp \
 		--with-xpm --enable-xpm-background --enable-transparency \
-		--with-xpm-includes=${X11BASE}/include/X11 \
-		--with-xpm-library=${X11BASE}/lib
+		--with-xpm-includes=${LOCALBASE}/include/X11 \
+		--with-xpm-library=${LOCALBASE}/lib
 MAN1=		rxvt.1
 PLIST_FILES=	bin/rxvt
 
diff --git a/x11/setxkbmap/Makefile b/x11/setxkbmap/Makefile
index de4245338302..1a4548f9df77 100644
--- a/x11/setxkbmap/Makefile
+++ b/x11/setxkbmap/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Set the keyboard using the X Keyboard Extension
 XORG_CAT=	app
 USE_XORG=	xkbfile x11
 
-CONFIGURE_ARGS=	--with-xkb-config-root=${X11BASE}/share/X11/xkb
+CONFIGURE_ARGS=	--with-xkb-config-root=${LOCALBASE}/share/X11/xkb
 
 PLIST_FILES=	bin/setxkbmap
 
diff --git a/x11/sisctrl/Makefile b/x11/sisctrl/Makefile
index 45d9f900ca57..d0e129130125 100644
--- a/x11/sisctrl/Makefile
+++ b/x11/sisctrl/Makefile
@@ -7,21 +7,20 @@
 
 PORTNAME=	sisctrl
 PORTVERSION=	0.0.20051202
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://www.winischhofer.net/sis/
 
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	Display Control Panel for XFree86/X.org SiS driver
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 ice xxf86vm xinerama xv xrandr
 USE_GNOME=	gtk20
 USE_GMAKE=	yes
-USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	 --with-xv-path=${X11BASE}/lib
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ARGS=	 --with-xv-path=${LOCALBASE}/lib
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 PLIST_FILES=	bin/sisctrl
 MAN1=		sisctrl.1x
diff --git a/x11/slock/Makefile b/x11/slock/Makefile
index 815c5bddb6e1..b3f74c1371e3 100644
--- a/x11/slock/Makefile
+++ b/x11/slock/Makefile
@@ -13,12 +13,12 @@ MASTER_SITES=	http://www.suckless.org/download/ CENKES
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Simple X screen locker
 
-MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${X11BASE}/lib" \
-		X11INC="${X11BASE}/include" CC="${CC}" \
+MAKE_ARGS=	PREFIX="${PREFIX}" X11LIB="${LOCALBASE}/lib" \
+		X11INC="${LOCALBASE}/include" CC="${CC}" \
 		MANPREFIX="${MANPREFIX}/man"
 PLIST_FILES=	bin/slock
 
-USE_XLIB=	yes
+USE_XORG=	x11 xt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-I/usr/include||;s|-L/usr/lib||;s|= -Os|+=|'\
diff --git a/x11/startup-notification/Makefile b/x11/startup-notification/Makefile
index 85b79486de82..721176f15c72 100644
--- a/x11/startup-notification/Makefile
+++ b/x11/startup-notification/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	startup-notification
 PORTVERSION=	0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
 		http://www.freedesktop.org/software/startup-notification/releases/
@@ -18,8 +18,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library that supports startup notification spec from freedesktop.org
 
 USE_BZIP2=	yes
+USE_XORG=	x11
 USE_AUTOTOOLS=	libtool:15
-USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/x11/swarp/Makefile b/x11/swarp/Makefile
index 565157fc0b22..2d74cac3796f 100644
--- a/x11/swarp/Makefile
+++ b/x11/swarp/Makefile
@@ -15,8 +15,8 @@ MASTER_SITES=	http://www.suckless.org/download/ \
 MAINTAINER=	daniel@roe.ch
 COMMENT=	X11 generic pointer warping utility
 
-MAKE_ARGS=	LDFLAGS="${LDFLAGS} -L${X11BASE}/lib -lX11" \
-		CFLAGS="${CFLAGS} -I${X11BASE}/include \
+MAKE_ARGS=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -lX11" \
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
 			-DVERSION=\\\"${PORTVERSION}\\\"" \
 		LD=${CC}
 
diff --git a/x11/temperature.app/files/patch-Makefile b/x11/temperature.app/files/patch-Makefile
index f1e980335707..1a2df17c74ff 100644
--- a/x11/temperature.app/files/patch-Makefile
+++ b/x11/temperature.app/files/patch-Makefile
@@ -6,14 +6,14 @@
  DESTDIR =
 -GNUSTEP_BINDIR = /usr/local/GNUstep/Apps/Temperature.app
 -X11_BINDIR = /usr/X11R6/bin
-+GNUSTEP_BINDIR = $(X11BASE)/GNUstep/Apps/Temperature.app
-+X11_BINDIR = $(X11BASE)/bin
++GNUSTEP_BINDIR = $(LOCALBASE)/GNUstep/Apps/Temperature.app
++X11_BINDIR = $(LOCALBASE)/bin
  
  CXX=c++
 -CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -O2 -I/usr/X11R6/include
 -LDFLAGS += -L/usr/X11R6/lib -lXpm -lXext -lX11
-+CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(X11BASE)/include
-+LDFLAGS += -L$(X11BASE)/lib -lXpm -lXext -lX11
++CXXFLAGS += -Wall -pedantic -fno-rtti -fno-exceptions -I$(LOCALBASE)/include
++LDFLAGS += -L$(LOCALBASE)/lib -lXpm -lXext -lX11
  
  OBJECTS = Main.o Temperature.o Xpm.o
  
diff --git a/x11/tkXwin/Makefile b/x11/tkXwin/Makefile
index 30ddc776b16c..5eb7d4d30edd 100644
--- a/x11/tkXwin/Makefile
+++ b/x11/tkXwin/Makefile
@@ -7,17 +7,16 @@
 
 PORTNAME=	tkXwin
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITES_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Tcl/Tk library to detect idle periods of an X session
 
 GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	xt xscrnsaver
 USE_LDCONFIG=	yes
 USE_TK=		84+
 
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index 097c255c3358..35363480217e 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	trayer
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_DEBIAN}
 MASTER_SITE_SUBDIR=	pool/main/t/trayer
@@ -18,9 +18,9 @@ COMMENT=	Lightweight GTK2-based systray for UNIX desktop
 
 USE_GNOME=	gtk20 glib20 pango atk
 USE_ICONV=	yes
-
+USE_XORG=	xmu
 USE_GMAKE=	yes
-MAKE_ARGS=	"PREFIX=${X11BASE}"
+MAKE_ARGS=	"PREFIX=${PREFIX}"
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .if !defined(NOPORTDOCS)
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index 5e0d52ce79a0..4cec92714365 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A nifty set of desktop apps, including floating buttons
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 REINPLACE_ARGS=	-i ""
 
 post-patch:
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile
index 49b88b8436aa..2dd877672d56 100644
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@@ -40,8 +40,8 @@ CONFIGURE_ARGS=	--with-logdir=/var/log \
 		--with-Logo=beastie.xpm \
 		--with-gfx-incs=${LOCALBASE}/include \
 		--with-gfx-libs=${LOCALBASE}/lib \
-		--with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \
-		--with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \
+		--with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin \
+		--with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin \
 		--with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm
 
 MAN1=	wdm.1 wdmLogin.1
@@ -49,8 +49,8 @@ MAN1=	wdm.1 wdmLogin.1
 CPPFLAGS=	-I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT
 LDFLAGS=	-L${LOCALBASE}/lib -lintl
 
-DEF_SERVER?=	${X11BASE}/bin/X
-XRDB_PATH?=	${X11BASE}/bin/xrdb
+DEF_SERVER?=	${LOCALBASE}/bin/X
+XRDB_PATH?=	${LOCALBASE}/bin/xrdb
 
 WDMDIR=		${PREFIX}/lib/X11/wdm
 
diff --git a/x11/wmbutton/Makefile b/x11/wmbutton/Makefile
index 27dd0eac8a0a..7bcce6f9c4af 100644
--- a/x11/wmbutton/Makefile
+++ b/x11/wmbutton/Makefile
@@ -20,9 +20,9 @@ SUB_FILES=	pkg-message
 
 do-build:
 	cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} \
-		-I${X11BASE}/include/X11 -I${X11BASE}/include \
+		-I${LOCALBASE}/include/X11 -I${LOCALBASE}/include \
 		wmb_libs.c wmbutton.c -o wmbutton \
-		-L${X11BASE}/lib -lXpm -lXext -lX11
+		-L${LOCALBASE}/lib -lXpm -lXext -lX11
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmbutton ${PREFIX}/bin/wmbutton
diff --git a/x11/wmdrawer/Makefile b/x11/wmdrawer/Makefile
index 30efd09be12b..bd43bb94f73c 100644
--- a/x11/wmdrawer/Makefile
+++ b/x11/wmdrawer/Makefile
@@ -36,7 +36,7 @@ post-patch:
 		s,LDFLAGS =,LDFLAGS+=,g; s,PREFIX =,#PREFIX =,g; \
 		s,$$[(]DESTDIR[)]/usr/local,${PREFIX},g; \
 		s,CC =,#CC =,g; \
-		s,/usr/X11R6,${X11BASE},g" ${WRKSRC}/Makefile
+		s,/usr/X11R6,${LOCALBASE},g" ${WRKSRC}/Makefile
 
 post-install:
 	@${MKDIR} ${DATADIR}
diff --git a/x11/wmfstatus/files/patch-Makefile b/x11/wmfstatus/files/patch-Makefile
index 1c6d893a129e..c0855d4a0ffc 100644
--- a/x11/wmfstatus/files/patch-Makefile
+++ b/x11/wmfstatus/files/patch-Makefile
@@ -2,7 +2,7 @@
 +++ Makefile	Thu Dec 27 18:35:43 2001
 @@ -1,6 +1,6 @@
 -LIBDIR = -L/usr/X11R6/lib
-+LIBDIR = -L${X11BASE}/lib
++LIBDIR = -L${LOCALBASE}/lib
  LIBS   = -lXpm -lXext -lX11
 -FLAGS = -O2
 +FLAGS = ${CFLAGS}
@@ -14,7 +14,7 @@
  
  .c.o:
 -	cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
-+	${CC} -I${X11BASE}/include $(FLAGS) -c -Wall $< -o $*.o
++	${CC} -I${LOCALBASE}/include $(FLAGS) -c -Wall $< -o $*.o
  
  wmfstatus: $(OBJS)
 -	cc $(FLAGS) -o wmfstatus $^ -lXext $(LIBDIR) $(LIBS)
diff --git a/x11/wmmatrix/files/patch-aa b/x11/wmmatrix/files/patch-aa
index 8a0f151d0d80..15e9328637a6 100644
--- a/x11/wmmatrix/files/patch-aa
+++ b/x11/wmmatrix/files/patch-aa
@@ -8,9 +8,9 @@
 -LIBDIR = -L/usr/X11R6/lib
 +CC     ?= gcc
 +CFLAGS ?= -O2 -Wall 
-+INCDIR = -I${X11BASE}/include
-+DESTDIR= ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
++INCDIR = -I${LOCALBASE}/include
++DESTDIR= ${LOCALBASE}
++LIBDIR = -L${LOCALBASE}/lib
  
  # for Linux
  LIBS   = -lXpm -lX11 -lXext
diff --git a/x11/wmmenu/files/patch-Makefile b/x11/wmmenu/files/patch-Makefile
index f73cdcbc762e..fb20c04d5c31 100644
--- a/x11/wmmenu/files/patch-Makefile
+++ b/x11/wmmenu/files/patch-Makefile
@@ -11,7 +11,7 @@
  
 -XROOT = /usr/X11R6
 -DAROOT = /usr/local
-+XROOT = $(X11BASE)
++XROOT = $(LOCALBASE)
 +DAROOT = $(LOCALBASE)
  
  # If you want to use gdk-pixbuf, pass GDKPIXBUF=1 to make command
diff --git a/x11/wmxss/files/patch-Src::Makefile b/x11/wmxss/files/patch-Src::Makefile
index b6bbfcd593ea..c5f1a187b4c2 100644
--- a/x11/wmxss/files/patch-Src::Makefile
+++ b/x11/wmxss/files/patch-Src::Makefile
@@ -20,9 +20,9 @@
  
 -OBJS   = wmxss.o \
 -         xutils.o
-+CFLAGS+=	-I${X11BASE}/include -O2 -Wall
++CFLAGS+=	-I${LOCALBASE}/include -O2 -Wall
 +LDADD+=	-lXpm -lX11 -lXext
-+LDADD+= -L${X11BASE}/lib
++LDADD+= -L${LOCALBASE}/lib
  
 +NOMAN=
  
diff --git a/x11/workrave/Makefile b/x11/workrave/Makefile
index de799d989870..90176ad3cf1f 100644
--- a/x11/workrave/Makefile
+++ b/x11/workrave/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	workrave
 PORTVERSION=	1.8.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	SF
 
@@ -17,9 +17,9 @@ COMMENT=	A Gnome RSI prevention tool
 OPTIONS=	GNOME "Build with Gnome support" on \
 		NETWORK "Build with network support" on
 
+USE_XORG=	x11 xmu
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 intltool
-USE_GCC=	3.4+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-gconf
diff --git a/x11/wrapper/Makefile b/x11/wrapper/Makefile
index 4ae5cb383056..cbf5feabf322 100644
--- a/x11/wrapper/Makefile
+++ b/x11/wrapper/Makefile
@@ -21,7 +21,7 @@ USE_XORG=	x11
 
 .include <bsd.port.pre.mk>
 
-XSERVER=	-DXSERVER_PATH=\"${X11BASE}/bin/Xorg\"
+XSERVER=	-DXSERVER_PATH=\"${LOCALBASE}/bin/Xorg\"
 PKGNAMEPREFIX=	xorg-
 COMMENT=	Wrapper for X.org X11 server
 
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 0b36db0bd8d7..8c91821266c5 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -9,13 +9,12 @@ PORTNAME=	wterm
 PORTVERSION=	6.2.9
 PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	A color vt102 terminal emulator with transparency support
 
-BUILD_DEPENDS=	${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
+BUILD_DEPENDS=	${LOCALBASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
 
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
@@ -23,8 +22,8 @@ CONFIGURE_ARGS=	--enable-transparency --enable-xpm-background \
 		--disable-delete-key --disable-backspace-key \
 		--enable-next-scrollbar --enable-utmp --enable-wtmp \
 		--enable-menubar --enable-graphics --with-term=xterm-color \
-		--with-xpm-includes=${X11BASE} --with-xpm-library=${X11BASE}
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include/WINGs"
+		--with-xpm-includes=${LOCALBASE} --with-xpm-library=${LOCALBASE}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/WINGs"
 
 MAN1=		wterm.1
 PLIST_FILES=	bin/wterm
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 7410e689b75d..ae6f4136d4f5 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -7,15 +7,17 @@
 
 PORTNAME=	x3270
 PORTVERSION=	3.3.7
+PORTREVISION=	1
 CATEGORIES=	x11 net
-MASTER_SITES=	SFE
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3270 Terminal emulator
 
-BUILD_DEPENDS=	bdftopcf:${X_CLIENTS_PORT}
-RUN_DEPENDS=	mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
+		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USE_IMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index da1f81c6adc2..47fd7111109e 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -21,7 +21,7 @@ MAN1=		xballoon.1
 PLIST_FILES=	bin/xballoon
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g ; \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g ; \
 		 s|gcc |$${CC} |g ; \
 		 s|-O |$${CFLAGS} |g' ${WRKSRC}/Makefile
 
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index 93fccde40276..0d8170b130d3 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Make your XDM login screen look beautiful
 USE_XORG=	xpm x11
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/xres.c ${WRKSRC}/samples/XBanner.ad
 
 post-install:
diff --git a/x11/xbanner/files/patch-aa b/x11/xbanner/files/patch-aa
index ec588239ad50..291e999b9004 100644
--- a/x11/xbanner/files/patch-aa
+++ b/x11/xbanner/files/patch-aa
@@ -40,10 +40,10 @@
 ! BINDIR	=$(PREFIX)/bin
   
   # Library directories for Linux
-! XLIBDIR	=$(X11BASE)/lib
+! XLIBDIR	=$(LOCALBASE)/lib
   
   # Include directory for gcc (if you get X11/Xlib.h: file not found)
-! INCDIR =-I$(X11BASE)/include
+! INCDIR =-I$(LOCALBASE)/include
   
   # Library directories for the Ultrix (probably most Unixes)
   #XLIBDIR =/usr/lib/X11
diff --git a/x11/xbanner/files/patch-ac b/x11/xbanner/files/patch-ac
index 511a61378370..e6ff71c417c0 100644
--- a/x11/xbanner/files/patch-ac
+++ b/x11/xbanner/files/patch-ac
@@ -24,7 +24,7 @@
   
   #ifndef vms
 ! #  if (defined(BSD) && (BSD >= 199306))
-!      strcpy(line,"%%X11BASE%%/lib/X11/app-defaults/");
+!      strcpy(line,"%%LOCALBASE%%/lib/X11/app-defaults/");
 ! #  else
 !      strcpy(line,"/usr/lib/X11/app-defaults/");
 ! #  endif
diff --git a/x11/xbanner/files/patch-ae b/x11/xbanner/files/patch-ae
index bcb35f5e0649..8363c175e201 100644
--- a/x11/xbanner/files/patch-ae
+++ b/x11/xbanner/files/patch-ae
@@ -13,7 +13,7 @@
   XBanner.BarSize:	12
   
   ! Name of the pixmap file to tile over the root window
-! !XBanner.BgPixFile:	%%X11BASE%%/include/X11/pixmaps/xdm_bg.xpm
+! !XBanner.BgPixFile:	%%LOCALBASE%%/include/X11/pixmaps/xdm_bg.xpm
   
   ! The number of ripples for the Ripples BG style
   XBanner.Ripples:	3
diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index bd2adb76c104..a21aea484423 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -15,7 +15,6 @@ COMMENT=	The X protocol C-language Binding (XCB) protocol
 
 BUILD_DEPENDS=	xmllint:${PORTSDIR}/textproc/libxml2
 
-PREFIX?=	${X11BASE}
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
diff --git a/x11/xclick/Makefile b/x11/xclick/Makefile
index b35f863171e6..10065ca94bd8 100644
--- a/x11/xclick/Makefile
+++ b/x11/xclick/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES=	bin/${PORTNAME}
 
 do-build:
 	@cd ${WRKSRC} && \
-		${CC} -L${X11BASE}/lib -I${X11BASE}/include click.c \
+		${CC} -L${LOCALBASE}/lib -I${LOCALBASE}/include click.c \
 			-lX11 -lXtst -o ${PORTNAME}
 
 do-install:
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index c707e6c73ee0..e9f25c718cfc 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -18,13 +18,13 @@ COMMENT=	X utility to translate rgb values into X color names
 
 LIB_DEPENDS=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
 
-WRKSRC=		$(WRKDIR)/xcolorsel
+WRKSRC=		${WRKDIR}/xcolorsel
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN1=		xcolorsel.1
 
 post-patch:
-	@${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
+	@${ECHO_CMD} "*.file: ${LOCALBASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
 	@${REINPLACE_CMD} -e 's|#include <malloc.h>||g' \
 		-e 's|/Xaw/|/Xaw3d/|g' ${WRKSRC}/*.[ch]
 	@${REINPLACE_CMD} -e 's|app2head|./app2head|g' \
diff --git a/x11/xcut/files/patch-aa b/x11/xcut/files/patch-aa
index 1ddcfd603131..1ac717af3517 100644
--- a/x11/xcut/files/patch-aa
+++ b/x11/xcut/files/patch-aa
@@ -6,8 +6,8 @@
  
 -BINDIR=/usr/local/bin
 -MANPATH=/usr/local/man
-+BINDIR=${X11BASE}/bin
-+MANPATH=${X11BASE}${MAN1PREFIX}/man
++BINDIR=${LOCALBASE}/bin
++MANPATH=${LOCALBASE}${MAN1PREFIX}/man
  MANSUFFIX=1
  
  XCOMM Build xcut and manpage
diff --git a/x11/xdotool/Makefile b/x11/xdotool/Makefile
index d1206dc466aa..36f90dc24df9 100644
--- a/x11/xdotool/Makefile
+++ b/x11/xdotool/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xdotool
 DISTVERSION=	20070903
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.semicomplete.com/files/xdotool/ \
 		http://www.atarininja.org/~wxs/distfiles/
@@ -15,7 +16,7 @@ MAINTAINER=	wxs@FreeBSD.org
 COMMENT=	Programatically simulate keyboard input or mouse activity
 
 USE_GNOME=	pkgconfig
-USE_XLIB=	yes
+USE_XORG=	x11 xtst
 ALL_TARGET=	${PORTNAME}
 
 PLIST_FILES=	bin/xdotool
diff --git a/x11/xdtm/Makefile b/x11/xdtm/Makefile
index 56a667784883..ee2d2ff4d984 100644
--- a/x11/xdtm/Makefile
+++ b/x11/xdtm/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=		ports@FreeBSD.org
 COMMENT=	A graphical shell for the X Window System
 
 USE_IMAKE=		yes
-USE_XPM=		yes
+USE_XORG=		xpm
 WRKSRC=			${WRKDIR}/xdtm
 MAN1=			xdtm.1
 
diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile
index 25583b8df55d..59a357265270 100644
--- a/x11/xfce4-taskmanager/Makefile
+++ b/x11/xfce4-taskmanager/Makefile
@@ -16,8 +16,6 @@ DIST_SUBDIR=	xfce4
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	A task manager for XFCE
 
-CONFIGURE_ENV=	PKG_CONFIG_PATH=${X11BASE}/libdata/pkgconfig:${LOCALBASE}/libdata/pkgconfig
-
 GNU_CONFIGURE=	yes
 USE_BZIP=	yes
 USE_GETTEXT=	yes
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index 0757c79229fd..e3c22550befe 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -7,9 +7,9 @@
 
 PORTNAME=	xfree86_xkb_xml
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -17,12 +17,12 @@ COMMENT=	A little set of XML files useful for dealing with XKB rules
 
 USE_ICONV=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnometarget
 USE_PERL5_BUILD=yes
-CONFIGURE_ARGS=	--with-xkb-base=${X11BASE}/lib/X11/xkb
+CONFIGURE_ARGS=	--with-xkb-base=${LOCALBASE}/lib/X11/xkb
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/x11/xgrab/Makefile b/x11/xgrab/Makefile
index 75041aef7b93..fd65ecfb5a57 100644
--- a/x11/xgrab/Makefile
+++ b/x11/xgrab/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xgrab
 PORTVERSION=	2.41
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
@@ -17,9 +17,9 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	An X11 image grabber
 
-BUILD_DEPENDS=	xrdb:${X_CLIENTS_PORT}
+BUILD_DEPENDS=	xrdb:${PORTSDIR}/x11/xrdb
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 USE_IMAKE=	yes
 USE_DISPLAY=	yes
 
diff --git a/x11/xidle/Makefile b/x11/xidle/Makefile
index 003967529ca9..2229b5483fd7 100644
--- a/x11/xidle/Makefile
+++ b/x11/xidle/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Run a program on X inactivity
 
 USE_BZIP2=	yes
-CFLAGS+=	-I${X11BASE}/include -I${LOCALBASE}/include -D__dead=static
-MAKE_ARGS+=	X11LIBDIR="${X11BASE}/lib" \
+CFLAGS+=	-I${LOCALBASE}/include -D__dead=static
+MAKE_ARGS+=	X11LIBDIR="${LOCALBASE}/lib" \
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 USE_XORG=	x11 xscrnsaver
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index b270df25ef5b..f6c0f552ff99 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -18,7 +18,7 @@ MAN1=		xkbset.1
 USE_XORG=	x11
 USE_PERL5_BUILD=	yes
 
-MAKE_ARGS=	X11BASE="${X11BASE}" X11PREFIX="${PREFIX}" \
+MAKE_ARGS=	X11BASE="${LOCALBASE}" X11PREFIX="${PREFIX}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 843c15b4487f..4e91d24b70d7 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -16,9 +16,6 @@ COMMENT=	X Keyboard Configuration Database
 
 BUILD_DEPENDS=	xkbcomp:${PORTSDIR}/x11/xkbcomp
 
-# XXX - sigh
-PREFIX=		${X11BASE}
-
 USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index ca088c06985c..e58293a63d74 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	xkeywrap
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA014157/myfreesoft/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Record, repeat, and play key sequence from keyboard
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xt
 MAN1=		xkeywrap.1
 MANCOMPRESSED=	yes
 PORTSDOCDIR=	${PREFIX}/share/doc/xkeywrap
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index 5a58229e6814..e31d85b238f3 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -7,7 +7,7 @@
 
 VERSION=	4.1
 REVISION=	16
-PORTREVISION=	1
+PORTREVISION=	2
 
 PORTNAME=	xloadimage
 PORTVERSION=	${VERSION}.${REVISION}
@@ -24,7 +24,7 @@ COMMENT=	X11 Image Loading Utility
 PATCH_STRIP=	-p1
 EXTRA_PATCHES=	${WRKSRC}/debian/patches/*.dpatch
 
-USE_XLIB=	yes
+USE_XORG=	x11
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index 26fd0d89e7ca..8a07f3b07aa1 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Magnifying glass for X. like xmag but with continously updates
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 
 PLIST_FILES=	bin/xlupe
 
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 6101d039e0b2..901d6dc4c7d9 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -29,8 +29,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|= /usr/X11R6|= $${PREFIX}|g ; \
 		 s|gcc |$${CC} |g ; \
 		 s|-O |$${CFLAGS} |g ; \
-		 s|-I/usr/X11R6/|-I$${X11BASE}/|g ; \
-		 s|-L/usr/X11R6/|-L$${X11BASE}/|g' ${WRKSRC}/Makefile
+		 s|-I/usr/X11R6/|-I$${LOCALBASE}/|g ; \
+		 s|-L/usr/X11R6/|-L$${LOCALBASE}/|g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmangekyou ${PREFIX}/bin
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index 8e19697416bb..e5ac66af1bd1 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -37,7 +37,7 @@ USE_MOTIF=	yes
 .endif
 
 .if defined(WITH_XPM)
-USE_XPM=	yes
+USE_XORG=	xpm
 .endif
 
 post-extract:
@@ -59,7 +59,7 @@ post-patch:
 .endif
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${X11BASE}/bin/xmotd
+	${INSTALL_PROGRAM} ${WRKSRC}/xmotd ${LOCALBASE}/bin/xmotd
 	${INSTALL_MAN} ${WRKSRC}/xmotd.8 ${MANPREFIX}/man/man8
 
 .include <bsd.port.post.mk>
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index 2e027bd6b20d..dfac0b26eae6 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xmx
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cs.brown.edu/pub/xmx/
 EXTRACT_SUFX=	.tar.Z
@@ -15,7 +15,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ob@breuninger.org
 COMMENT=	An X protocol multiplexor
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11
 
 MAN1=		xmx.1
 PLIST_FILES=	bin/xmx
diff --git a/x11/xmx/files/patch-aa b/x11/xmx/files/patch-aa
index e9bee16fd789..d8ac3b0afbcb 100644
--- a/x11/xmx/files/patch-aa
+++ b/x11/xmx/files/patch-aa
@@ -29,8 +29,8 @@
 -
 -$(XMX):	$(OFILES)
 -	cc $(CFLAGS) -o $(XMX) $(OFILES) $(LIB)
-+LIBPATH		= -L${X11BASE}/lib 
-+INCPATH		= -I${X11BASE}/include
++LIBPATH		= -L${LOCALBASE}/lib 
++INCPATH		= -I${LOCALBASE}/include
  
 -debug:
 -	make xmxd CFLAGS="$(DBGFG)" LIB="$(DEBUGLIB)"
diff --git a/x11/xnodecor/files/Makefile b/x11/xnodecor/files/Makefile
index 36716bb8b1c8..be49a441103f 100644
--- a/x11/xnodecor/files/Makefile
+++ b/x11/xnodecor/files/Makefile
@@ -1,6 +1,6 @@
 # $FreeBSD$
-CFLAGS=		-I${X11BASE}/include
-LDFLAGS=	-L${X11BASE}/lib
+CFLAGS=		-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
 LIBS=		-lX11
 
 all:	xnodecor
@@ -9,7 +9,7 @@ xnodecor:
 	$(CC) -o xnodecor xnodecor.c $(CFLAGS) $(LDFLAGS) $(LIBS)
 
 install:
-	${BSD_INSTALL_PROGRAM} xnodecor ${X11BASE}/bin
+	${BSD_INSTALL_PROGRAM} xnodecor ${LOCALBASE}/bin
 
 clean:
 	rm -f *.rej a.out core xnodecor
diff --git a/x11/xorg-apps/Makefile b/x11/xorg-apps/Makefile
index d40fe7d54dcd..ec91aac278fe 100644
--- a/x11/xorg-apps/Makefile
+++ b/x11/xorg-apps/Makefile
@@ -15,8 +15,6 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org apps meta-port
 
-PREFIX?=	${X11BASE}
-
 RUN_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \
diff --git a/x11/xorg-libraries/Makefile b/x11/xorg-libraries/Makefile
index cbdeee5b6dab..d791a81da42b 100644
--- a/x11/xorg-libraries/Makefile
+++ b/x11/xorg-libraries/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xorg-libraries
 PORTVERSION=	7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -18,51 +18,49 @@ COMMENT=	X.org libraries meta-port
 
 NO_BUILD=	yes
 
-PREFIX?=	${X11BASE}
-
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
-		${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
-		${X11BASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \
-		${X11BASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \
-		${X11BASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \
-		${X11BASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \
-		${X11BASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \
-		${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \
-		${X11BASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \
-		${X11BASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \
-		${X11BASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \
-		${X11BASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \
-		${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
-		${X11BASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \
-		${X11BASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
-		${X11BASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \
-		${X11BASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
-		${X11BASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \
-		${X11BASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \
-		${X11BASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \
-		${X11BASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \
-		${X11BASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \
-		${X11BASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \
-		${X11BASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \
-		${X11BASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \
-		${X11BASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \
-		${X11BASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \
-		${X11BASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \
-		${X11BASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \
-		${X11BASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \
-		${X11BASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
-		${X11BASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \
-		${X11BASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
-		${X11BASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \
-		${X11BASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \
-		${X11BASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \
-		${X11BASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \
-		${X11BASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \
-		${X11BASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
-		${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \
-		${X11BASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
-		${X11BASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \
-		${X11BASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/x11.pc:${PORTSDIR}/x11/libX11 \
+		${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
+		${LOCALBASE}/libdata/pkgconfig/xfontcache.pc:${PORTSDIR}/x11-fonts/libXfontcache \
+		${LOCALBASE}/libdata/pkgconfig/ice.pc:${PORTSDIR}/x11/libICE \
+		${LOCALBASE}/libdata/pkgconfig/sm.pc:${PORTSDIR}/x11/libSM \
+		${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres \
+		${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap \
+		${LOCALBASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \
+		${LOCALBASE}/libdata/pkgconfig/xaw8.pc:${PORTSDIR}/x11-toolkits/libXaw \
+		${LOCALBASE}/libdata/pkgconfig/xcomposite.pc:${PORTSDIR}/x11/libXcomposite \
+		${LOCALBASE}/libdata/pkgconfig/xcursor.pc:${PORTSDIR}/x11/libXcursor \
+		${LOCALBASE}/libdata/pkgconfig/xdamage.pc:${PORTSDIR}/x11/libXdamage \
+		${LOCALBASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
+		${LOCALBASE}/libdata/pkgconfig/xevie.pc:${PORTSDIR}/x11/libXevie \
+		${LOCALBASE}/libdata/pkgconfig/xext.pc:${PORTSDIR}/x11/libXext \
+		${LOCALBASE}/libdata/pkgconfig/xfixes.pc:${PORTSDIR}/x11/libXfixes \
+		${LOCALBASE}/libdata/pkgconfig/xfont.pc:${PORTSDIR}/x11-fonts/libXfont \
+		${LOCALBASE}/libdata/pkgconfig/xi.pc:${PORTSDIR}/x11/libXi \
+		${LOCALBASE}/libdata/pkgconfig/xinerama.pc:${PORTSDIR}/x11/libXinerama \
+		${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \
+		${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \
+		${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \
+		${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \
+		${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \
+		${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver \
+		${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt \
+		${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst \
+		${LOCALBASE}/libdata/pkgconfig/xv.pc:${PORTSDIR}/x11/libXv \
+		${LOCALBASE}/libdata/pkgconfig/xvmc.pc:${PORTSDIR}/x11/libXvMC \
+		${LOCALBASE}/libdata/pkgconfig/xxf86dga.pc:${PORTSDIR}/x11/libXxf86dga \
+		${LOCALBASE}/libdata/pkgconfig/xxf86misc.pc:${PORTSDIR}/x11/libXxf86misc \
+		${LOCALBASE}/libdata/pkgconfig/xxf86vm.pc:${PORTSDIR}/x11/libXxf86vm \
+		${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \
+		${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \
+		${LOCALBASE}/libdata/pkgconfig/xft.pc:${PORTSDIR}/x11-fonts/libXft \
+		${LOCALBASE}/libdata/pkgconfig/xprintutil.pc:${PORTSDIR}/x11/libXprintUtil \
+		${LOCALBASE}/libdata/pkgconfig/xprintapputil.pc:${PORTSDIR}/x11/libXprintAppUtil \
+		${LOCALBASE}/libdata/pkgconfig/fontenc.pc:${PORTSDIR}/x11-fonts/libfontenc \
+		${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx \
+		${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans \
+		${LOCALBASE}/libdata/pkgconfig/libfs.pc:${PORTSDIR}/x11-fonts/libFS \
+		${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX \
+		${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman
 
 .if !defined(XORG_UPGRADE) && !defined(PACKAGE_BUILDING) && exists(/usr/X11R6)
 pre-everything::
@@ -78,7 +76,7 @@ pre-everything::
 	fi
 .elif !exists(/usr/X11R6) && !defined(WITHOUT_X11R6_SYMLINK)
 pre-install::
-	${LN} -s ${X11BASE} /usr/X11R6 || ${TRUE}
+	${LN} -s ${LOCALBASE} /usr/X11R6 || ${TRUE}
 .endif
 
 do-install:
diff --git a/x11/xorg-protos/Makefile b/x11/xorg-protos/Makefile
index 23671b6847e8..9cd01dcae685 100644
--- a/x11/xorg-protos/Makefile
+++ b/x11/xorg-protos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xorg-protos
 PORTVERSION=	7.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -16,8 +16,6 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.org protos meta-port
 
-USE_X_PREFIX=	yes
-
 BUILD_DEPENDS=	${PREFIX}/include/X11/extensions/bigreqstr.h:${PORTSDIR}/x11/bigreqsproto \
 		${PREFIX}/include/X11/extensions/composite.h:${PORTSDIR}/x11/compositeproto \
 		${PREFIX}/include/X11/extensions/damageproto.h:${PORTSDIR}/x11/damageproto \
diff --git a/x11/xorg/Makefile b/x11/xorg/Makefile
index f02f5f3885c7..b070ca9886fc 100644
--- a/x11/xorg/Makefile
+++ b/x11/xorg/Makefile
@@ -17,23 +17,22 @@ MAINTAINER=	x11@FreeBSD.org
 COMMENT=	X.Org complete distribution metaport
 
 NO_BUILD=	yes
-PREFIX?=	${X11BASE}
 
-RUN_DEPENDS+=	${X11BASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri
+RUN_DEPENDS+=	${LOCALBASE}/lib/dri/r128_dri.so:${PORTSDIR}/graphics/dri
 
 # data
-RUN_DEPENDS+=	${X11BASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
-		${X11BASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
+RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/xbitmaps.pc:${PORTSDIR}/x11/xbitmaps \
+		${LOCALBASE}/lib/X11/icons/handhelds/cursors/X_cursor:${PORTSDIR}/x11-themes/xcursor-themes
 
 # doc
-RUN_DEPENDS+=	${X11BASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs
+RUN_DEPENDS+=	${LOCALBASE}/share/X11/doc/hardcopy/BDF/bdf.PS.gz:${PORTSDIR}/x11/xorg-docs
 
 # app, lib, font, driver, proto
-RUN_DEPENDS+=	${X11BASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \
-		${X11BASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
-		${X11BASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \
-		${X11BASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \
-		${X11BASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos
+RUN_DEPENDS+=	${LOCALBASE}/libdata/xorg/apps:${PORTSDIR}/x11/xorg-apps \
+		${LOCALBASE}/libdata/xorg/libraries:${PORTSDIR}/x11/xorg-libraries \
+		${LOCALBASE}/libdata/xorg/fonts:${PORTSDIR}/x11-fonts/xorg-fonts \
+		${LOCALBASE}/libdata/xorg/drivers:${PORTSDIR}/x11-drivers/xorg-drivers \
+		${LOCALBASE}/libdata/xorg/protos:${PORTSDIR}/x11/xorg-protos
 
 .if defined(XORG_COMPLETE)
 RUN_DEPENDS+=	Xnest:${PORTSDIR}/x11-servers/xorg-nestserver \
@@ -59,7 +58,7 @@ DEPENDS_TARGET="package"
 .endif
 
 .if ${ARCH} != "alpha" && ${ARCH} != "ia64"
-RUN_DEPENDS+=	${X11BASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
+RUN_DEPENDS+=	${LOCALBASE}/bin/Xorg:${PORTSDIR}/x11-servers/xorg-server
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/xrestop/Makefile b/x11/xrestop/Makefile
index 1c9738659931..607f4a620d05 100644
--- a/x11/xrestop/Makefile
+++ b/x11/xrestop/Makefile
@@ -7,20 +7,21 @@
 
 PORTNAME=	xrestop
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://projects.o-hand.com/sources/${PORTNAME}/
 
 MAINTAINER=	bland@FreeBSD.org
 COMMENT=	X11 server side resource usage statistics monitor
 
-USE_X_PREFIX=	yes
+USE_XORG=	x11 xext xrender xt xres xproto
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget
+USE_GNOME=	gnometarget pkgconfig
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV=	CFLAGS=-I${X11BASE}/include \
-		LDFLAGS=-L${X11BASE}/lib
+CONFIGURE_ENV=	CFLAGS=-I${LOCALBASE}/include \
+		LDFLAGS=-L${LOCALBASE}/lib \
+		XLIBS="-L${LOCALBASE}/lib -lX11"
 
 MAN1=		xrestop.1
 PLIST_FILES=	bin/xrestop
diff --git a/x11/xrootconsole/Makefile b/x11/xrootconsole/Makefile
index 5dd59e9fb05b..eba30e191a4a 100644
--- a/x11/xrootconsole/Makefile
+++ b/x11/xrootconsole/Makefile
@@ -9,13 +9,12 @@ PORTNAME=	xrootconsole
 PORTVERSION=	0.6
 PORTREVISION=	1
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Writes any log live onto the background
 
-USE_XLIB=	yes
+USE_XORG=	x11
 USE_GMAKE=	yes
 
 MAN1=		xrootconsole.1
@@ -24,7 +23,7 @@ PLIST_FILES=	bin/xrootconsole
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CC =|CC ?=|g ; \
 		 s|^CFLAGS = -O2|CFLAGS +=|g ; \
-		 s|/usr/X11R6|$${X11BASE}|g' ${WRKSRC}/Makefile
+		 s|/usr/X11R6|$${LOCALBASE}|g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrootconsole ${PREFIX}/bin
diff --git a/x11/xrsi/Makefile b/x11/xrsi/Makefile
index ac5d043c4b3e..429258743e16 100644
--- a/x11/xrsi/Makefile
+++ b/x11/xrsi/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	xrsi
 PORTVERSION=	0.9
 PORTREVISION=	2
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xrsi
+MASTER_SITES=	SF
 
 MAINTAINER=	carpetsmoker@xs4all.nl
 COMMENT=	A minimalist break enforcer for linux/unix for the prevention of RSI
@@ -20,7 +19,7 @@ PLIST_FILES=	bin/xrsi
 PORTDOCS=	Readme Licence
 
 do-build:
-	${CC} ${CFLAGS} -I${X11BASE}/include -L${X11BASE}/lib -lX11 -o ${WRKSRC}/xrsi ${WRKSRC}/xrsi.c
+	${CC} ${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib -lX11 -o ${WRKSRC}/xrsi ${WRKSRC}/xrsi.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xrsi ${PREFIX}/bin/
diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile
index 12ae2dc840fc..b987c27e3f82 100644
--- a/x11/xscreensaver-gnome/Makefile
+++ b/x11/xscreensaver-gnome/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME?=	xscreensaver-gnome
 PORTVERSION=	4.24
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.jwz.org/xscreensaver/
 DISTNAME=	xscreensaver-${PORTVERSION}
@@ -20,9 +20,8 @@ LIB_DEPENDS=	gle.4:${PORTSDIR}/graphics/gle
 
 CONFLICTS?=	xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]*
 
-USE_XLIB=	yes
-USE_XPM=	yes
-USE_GL=		yes
+USE_XORG=	x11 xpm
+USE_GL=		gl
 USE_GMAKE=	yes
 USE_PERL5_RUN=	yes
 USE_GNOME=	gnomehier libglade2 gnomehack
diff --git a/x11/xscreensaver.app/Makefile b/x11/xscreensaver.app/Makefile
index f851a842fc70..adafe25c0968 100644
--- a/x11/xscreensaver.app/Makefile
+++ b/x11/xscreensaver.app/Makefile
@@ -9,8 +9,7 @@ PORTNAME=	XScreenSaver.App
 PORTVERSION=	2.3
 PORTREVISION=	3
 CATEGORIES=	x11 windowmaker
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xscreensaverapp
+MASTER_SITES=	SF/xscreensaverapp
 
 MAINTAINER=	hemi@puresimplicity.net
 COMMENT=	WindowMaker dockapp to control XScreenSaver
@@ -19,9 +18,9 @@ LIB_DEPENDS=	dockapp.2:${PORTSDIR}/x11-wm/libdockapp
 
 PLIST_FILES=	bin/XScreenSaver.App
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="-L${X11BASE}/lib" \
-		CPPFLAGS="-I${X11BASE}/include"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
+		CPPFLAGS="-I${LOCALBASE}/include"
 
-MAKE_ARGS=	"LDFLAGS+=-L${X11BASE}/lib"
+MAKE_ARGS=	"LDFLAGS+=-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 3b7f1da8418b..498485e32107 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gle.4:${PORTSDIR}/graphics/gle \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		glade-2.0.0:${PORTSDIR}/devel/libglade2
 
-USE_XPM=	yes
+USE_XORG=	xpm
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/xsnow/Makefile b/x11/xsnow/Makefile
index 201fedf2b7b3..74f6bd69cc0c 100644
--- a/x11/xsnow/Makefile
+++ b/x11/xsnow/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	jmz@FreeBSD.org
 COMMENT=	Create a snowy and Santa-y desktop
 
 USE_IMAKE=	yes
-USE_XPM=	yes
+USE_XORG=	xpm
 MAN6=		xsnow.6
 PLIST_FILES=	bin/xsnow
 
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index 945d9393247b..a90a8d1ccf82 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xstarroll
 PORTVERSION=	1.1b
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.saturn.dti.ne.jp/~hsakai/myfreesoft/
@@ -17,15 +17,14 @@ COMMENT=	Letters fly to far, far, far away
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.1
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_XORG=	xpm xt xaw
 ALL_TARGET=	xstarroll
 
 MAN1=		xstarroll.1
 PLIST_FILES=	bin/xstarroll
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/X11R6|$${X11BASE}|g ; \
+	@${REINPLACE_CMD} -e 's|/usr/X11R6|$${LOCALBASE}|g ; \
 		 s|gcc |$${CC} |g ; \
 		 s|-O |$${CFLAGS} |g' ${WRKSRC}/Makefile
 
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 0f378293783f..24b937cc61c5 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xstroke
 PORTVERSION=	0.5.12
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \
 		http://www.handhelds.org/download/projects/xstroke/release-0.5/
@@ -15,9 +15,8 @@ MASTER_SITES=	ftp://ftp.handhelds.org/projects/xstroke/release-0.5/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fullscreen gesture recognition
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
-
 USE_BISON=	build
+USE_XORG=	xft x11
 USE_IMAKE=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS=	-I${LOCALBASE}/include -I.
diff --git a/x11/xterm/Makefile b/x11/xterm/Makefile
index cedbf79c34f1..7d7492c5cd3b 100644
--- a/x11/xterm/Makefile
+++ b/x11/xterm/Makefile
@@ -20,8 +20,8 @@ BUILD_DEPENDS=	luit:${PORTSDIR}/x11/luit
 USE_XORG=	xaw xft
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LIBS="-L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=--enable-wide-chars --enable-luit --with-utempter \
 		--enable-narrowproto
 
diff --git a/x11/xtermcontrol/Makefile b/x11/xtermcontrol/Makefile
index cb4f931a2d6e..5d484611a477 100644
--- a/x11/xtermcontrol/Makefile
+++ b/x11/xtermcontrol/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
-		LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 PLIST_FILES=	bin/xtermcontrol
 MAN1=		${PORTNAME}.1
diff --git a/x11/xtrlock/files/Makefile b/x11/xtrlock/files/Makefile
index e0e02fe9ceed..26334d793097 100644
--- a/x11/xtrlock/files/Makefile
+++ b/x11/xtrlock/files/Makefile
@@ -18,7 +18,7 @@
 
 LDLIBS=-lX11 -lcrypt
 CC?=gcc
-CFLAGS+=-I${X11BASE}/include -L${X11BASE}/lib
+CFLAGS+=-I${LOCALBASE}/include -L${LOCALBASE}/lib
 INSTALL=install -c
 INSTALL_PROGRAM = ${INSTALL}
 INSTPGMFLAGS = -s -o root -m4111
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 3c699cb0232b..7c2f32796b1c 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	xvattr
 PORTVERSION=	1.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -17,6 +17,7 @@ COMMENT=	Getting and setting Xv attributes
 
 USE_PERL5_BUILD=	yes
 USE_GNOME=		gtk12
+USE_XORG=	x11 xv
 GNU_CONFIGURE=		yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 3757ddbdfa40..788cd3e537b0 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -25,7 +25,7 @@ USE_IMAKE=	yes
 .include <bsd.port.pre.mk>
 
 .if	defined(WITH_XAW3D)
-BUILD_DEPENDS=	${X11BASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d
+BUILD_DEPENDS=	${LOCALBASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
 
 .if	defined(WITH_XAW3D)
diff --git a/x11/xxkb/Makefile b/x11/xxkb/Makefile
index 17917fdaee59..f5b2d6e3ba76 100644
--- a/x11/xxkb/Makefile
+++ b/x11/xxkb/Makefile
@@ -8,15 +8,14 @@
 PORTNAME=		xxkb
 PORTVERSION=		1.11
 CATEGORIES=		x11
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	xxkb
+MASTER_SITES=		SF/xxkb
 DISTNAME=		${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=		alexander.pohoyda@gmx.net
 COMMENT=		An XKB keyboard layout switcher and indicator
 
 WRKSRC=			${WRKDIR}/${PORTNAME}
-USE_XPM=		yes
+USE_XORG=		xpm
 USE_IMAKE=		yes
 
 MAN1=			xxkb.1
author	Martin Wilke <miwi@FreeBSD.org>	2008-04-19 17:56:05 +0000
committer	Martin Wilke <miwi@FreeBSD.org>	2008-04-19 17:56:05 +0000
commit	3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch)
tree	d573ea09b2bf6be67cb497df199932da9e2707c4 /x11
parent	Update to version 2.2.6 (diff)