Index: code2000/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-fonts/code2000/pkg-plist,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist
--- code2000/pkg-plist	17 Jun 2008 21:30:54 -0000	1.5
+++ code2000/pkg-plist	13 Oct 2011 14:43:07 -0000
@@ -3,7 +3,7 @@
 %%FONTSDIR%%/code2000.ttf
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/fonts.scale
-@exec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% || true
 @unexec rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || true
-@unexec %%X11BASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% 2>/dev/null || true
+@unexec %%LOCALBASE%%/bin/fc-cache -f -v %D/%%FONTSDIR%% 2>/dev/null || true
 @dirrm %%FONTSDIR%%
Index: ctwm/files/Imakefile.local-additional
===================================================================
RCS file: /home/pcvs/ports/x11-wm/ctwm/files/Imakefile.local-additional,v
retrieving revision 1.1
diff -u -r1.1 Imakefile.local-additional
--- ctwm/files/Imakefile.local-additional	20 Jul 2005 08:39:52 -0000	1.1
+++ ctwm/files/Imakefile.local-additional	13 Oct 2011 14:43:07 -0000
@@ -1,7 +1,4 @@
 
-XCOMM We might actually prefer using something from X11BASE here instead,
-XCOMM since that's where we technically install XPM stuff (though it's
-XCOMM the same thing as USRLIBDIR)
 USER_XPMLIBDIR = -L$(USRLIBDIR)
 USER_XPMINCDIR = -I$(INCROOT)
 
Index: djview4/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/djview4/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- djview4/Makefile	23 Sep 2011 22:23:06 -0000	1.24
+++ djview4/Makefile	13 Oct 2011 14:43:07 -0000
@@ -21,8 +21,8 @@
 USE_QT_VER=	4
 QT_COMPONENTS=	gui network rcc_build uic_build moc_build qmake_build
 QT_NONSTANDARD=	yes
-CONFIGURE_ARGS=	--x-includes="${X11BASE}/include" \
-		--x-libraries="${X11BASE}/lib"
+CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" \
+		--x-libraries="${LOCALBASE}/lib"
 CONFIGURE_ENV=	QMAKE="${LOCALBASE}/bin/qmake-qt4" \
 		QMAKESPEC="${QMAKESPEC}"
 LDFLAGS+=	-L${LOCALBASE}/lib
Index: dtc/Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/dtc/Makefile,v
retrieving revision 1.41
diff -u -r1.41 Makefile
--- dtc/Makefile	17 Sep 2011 17:32:34 -0000	1.41
+++ dtc/Makefile	13 Oct 2011 14:43:07 -0000
@@ -31,8 +31,8 @@
 		${LOCALBASE}/sbin/chrootuid:${PORTSDIR}/security/chrootuid \
 		${LOCALBASE}/bin/wget:${PORTSDIR}/ftp/wget \
 		${LOCALBASE}/share/fpdf/fpdf.php:${PORTSDIR}/print/fpdf \
-		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		${X11BASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \
+		${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
+		${LOCALBASE}/lib/X11/fonts/webfonts/verdana.ttf:${PORTSDIR}/x11-fonts/webfonts \
 		${LOCALBASE}/bin/mhonarc:${PORTSDIR}/www/mhonarc \
 		${LOCALBASE}/bin/mlmmj-list:${PORTSDIR}/mail/mlmmj \
 		${LOCALBASE}/bin/ncftpput:${PORTSDIR}/ftp/ncftp3 \
Index: ghostscript7/Makefile
===================================================================
RCS file: /home/pcvs/ports/print/ghostscript7/Makefile,v
retrieving revision 1.141
diff -u -r1.141 Makefile
--- ghostscript7/Makefile	23 Sep 2011 22:25:00 -0000	1.141
+++ ghostscript7/Makefile	13 Oct 2011 14:43:07 -0000
@@ -127,8 +127,8 @@
 . endif
 USE_XORG=	xt xext
 CONFIGURE_ARGS+=--with-x \
-		--x-includes=${X11BASE}/include \
-		--x-libraries=${X11BASE}/lib
+		--x-includes=${LOCALBASE}/include \
+		--x-libraries=${LOCALBASE}/lib
 CONFLICTS_INSTALL+=	ghostscript7-nox11-[0-9]*
 .else
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
Index: ghostscript8/files/Makefile.drivers_post
===================================================================
RCS file: /home/pcvs/ports/print/ghostscript8/files/Makefile.drivers_post,v
retrieving revision 1.7
diff -u -r1.7 Makefile.drivers_post
--- ghostscript8/files/Makefile.drivers_post	20 Jul 2011 01:09:14 -0000	1.7
+++ ghostscript8/files/Makefile.drivers_post	13 Oct 2011 14:43:07 -0000
@@ -115,8 +115,8 @@
 .if defined(_X11_DEVS)
 USE_XORG=	xt xext
 CONFIGURE_ARGS+=--with-x \
-		--x-includes=${X11BASE}/include \
-		--x-libraries=${X11BASE}/lib
+		--x-includes=${LOCALBASE}/include \
+		--x-libraries=${LOCALBASE}/lib
 CONFLICTS_INSTALL+=	ghostscript8-nox11-[0-9]*
 .if defined(WITH_GTK)
 USE_GNOME=	atk gdkpixbuf2 glib20 gtk20
Index: ghostscript9/files/Makefile.drivers_post
===================================================================
RCS file: /home/pcvs/ports/print/ghostscript9/files/Makefile.drivers_post,v
retrieving revision 1.5
diff -u -r1.5 Makefile.drivers_post
--- ghostscript9/files/Makefile.drivers_post	20 Jul 2011 01:09:14 -0000	1.5
+++ ghostscript9/files/Makefile.drivers_post	13 Oct 2011 14:43:07 -0000
@@ -116,8 +116,8 @@
 USE_XORG=	xt xext
 X11BITS=	""
 CONFIGURE_ARGS+=--with-x \
-		--x-includes=${X11BASE}/include \
-		--x-libraries=${X11BASE}/lib
+		--x-includes=${LOCALBASE}/include \
+		--x-libraries=${LOCALBASE}/lib
 CONFLICTS_INSTALL+=	ghostscript9-nox11-[0-9]*
 .if defined(WITH_GTK)
 USE_GNOME=	atk gdkpixbuf2 glib20 gtk20
Index: glfw/Makefile
===================================================================
RCS file: /home/pcvs/ports/graphics/glfw/Makefile,v
retrieving revision 1.13
diff -u -r1.13 Makefile
--- glfw/Makefile	31 Aug 2011 22:01:22 -0000	1.13
+++ glfw/Makefile	13 Oct 2011 14:43:07 -0000
@@ -36,7 +36,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|/usr/X11R6|${X11BASE}| ; \
+		's|/usr/X11R6|${LOCALBASE}| ; \
 		 /CFLAGS_THREAD/s|"-pthread"|"${PTHREAD_CFLAGS}"| ; \
 		 /LFLAGS_THREAD/s|"-pthread"|"${PTHREAD_LIBS}"|' ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e \
Index: gpac-libgpac/Makefile
===================================================================
RCS file: /home/pcvs/ports/multimedia/gpac-libgpac/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- gpac-libgpac/Makefile	31 Mar 2010 11:59:25 -0000	1.23
+++ gpac-libgpac/Makefile	13 Oct 2011 14:43:07 -0000
@@ -36,7 +36,7 @@
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-CONFIGURE_ARGS=	--cc="${CC}" --X11-path="${X11BASE}" \
+CONFIGURE_ARGS=	--cc="${CC}" --X11-path="${LOCALBASE}" \
 		--extra-cflags="${CFLAGS}" --extra-ldflags="${LDFLAGS}" \
 		--enable-pic \
 		--use-js=no --use-a52=no --use-faad=no --use-ffmpeg=no \
Index: kmflcomp/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/kmflcomp/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- kmflcomp/Makefile	23 Sep 2011 22:25:43 -0000	1.10
+++ kmflcomp/Makefile	13 Oct 2011 14:43:07 -0000
@@ -39,7 +39,7 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|^install-data-am: install-kmflcompdocDATA|install-data-am:|' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib|-L${X11BASE}/lib|' \
+	@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib|-L${LOCALBASE}/lib|' \
 		${WRKSRC}/kmfl_compiler/Makefile.in
 	@${REINPLACE_CMD} -E 's,(VERSION= *)"0\.9\.7",\1"0.9.9",' \
 		${WRKSRC}/kmfl_compiler/kmfl_compiler.c
Index: linux-mplayer-plugin/Makefile.npapi
===================================================================
RCS file: /home/pcvs/ports/www/linux-mplayer-plugin/Makefile.npapi,v
retrieving revision 1.5
diff -u -r1.5 Makefile.npapi
--- linux-mplayer-plugin/Makefile.npapi	12 Jul 2009 22:04:07 -0000	1.5
+++ linux-mplayer-plugin/Makefile.npapi	13 Oct 2011 14:43:07 -0000
@@ -129,9 +129,9 @@
 .endfor
 
 NPAPI_APPS?=	${USE_NPAPI_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*} \
-				${USE_NPAPI_EXP:S.^.${X11BASE}/lib/.:S.$./plugins.:N*opera*} \
+				${USE_NPAPI_EXP:S.^.${LOCALBASE}/lib/.:S.$./plugins.:N*opera*} \
 				${USE_NPAPI_EXP:S.^.${LOCALBASE}/share/.:S.$./plugins.:M*/opera*} \
-				${USE_NPAPI_EXP:S.^.${X11BASE}/share/.:S.$./plugins.:M*/opera*}
+				${USE_NPAPI_EXP:S.^.${LOCALBASE}/share/.:S.$./plugins.:M*/opera*}
 NPAPI_SLDIRS_ALL=	${NPAPI_APPS_ALL:S.^.${NPAPI_SLDIR}/.}
 NPAPI_SLDIRS=		${USE_NPAPI_EXP:S.^.${NPAPI_SLDIR}/.}
 NPAPI_LINKFARMS=	${NPAPI_APPS} ${NPAPI_SLDIRS}
Index: linux_base-f10/Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/linux_base-f10/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- linux_base-f10/Makefile	21 Jul 2011 04:39:21 -0000	1.61
+++ linux_base-f10/Makefile	13 Oct 2011 14:43:07 -0000
@@ -168,7 +168,7 @@
 #
 # Create a good ld.so.conf and touch ld.so.cache
 #
-	@${ECHO_CMD} -e '/lib\n/usr/lib\n${X11BASE}/lib' >> \
+	@${ECHO_CMD} -e '/lib\n/usr/lib\n${LOCALBASE}/lib' >> \
 		${WRKSRC}/etc/ld.so.conf
 	@${TOUCH} ${WRKSRC}/etc/ld.so.cache
 #
Index: linux_base-fc4/Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/linux_base-fc4/Makefile,v
retrieving revision 1.37
diff -u -r1.37 Makefile
--- linux_base-fc4/Makefile	7 Mar 2011 15:08:19 -0000	1.37
+++ linux_base-fc4/Makefile	13 Oct 2011 14:43:07 -0000
@@ -145,7 +145,7 @@
 #
 # Create a good ld.so.conf and touch ld.so.cache
 #
-	@${ECHO_CMD} -e '/lib\n/usr/lib\n${X11BASE}/lib' >> \
+	@${ECHO_CMD} -e '/lib\n/usr/lib\n${LOCALBASE}/lib' >> \
 		${WRKSRC}/etc/ld.so.conf
 	@${TOUCH} ${WRKSRC}/etc/ld.so.cache
 #
Index: linuxlibertine/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-fonts/linuxlibertine/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- linuxlibertine/pkg-plist	12 May 2009 08:33:41 -0000	1.3
+++ linuxlibertine/pkg-plist	13 Oct 2011 14:43:08 -0000
@@ -22,4 +22,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
Index: linuxpluginwrapper/Makefile
===================================================================
RCS file: /home/pcvs/ports/www/linuxpluginwrapper/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- linuxpluginwrapper/Makefile	6 Jan 2009 16:53:04 -0000	1.63
+++ linuxpluginwrapper/Makefile	13 Oct 2011 14:43:08 -0000
@@ -29,7 +29,7 @@
 
 # I will remove WITH_PLUGINS knob.
 .if		defined(WITH_REALPLAYER)
-RUN_DEPENDS+=	${X11BASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
+RUN_DEPENDS+=	${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so:${PORTSDIR}/multimedia/linux-realplayer
 WITH_PLUGINS=	1
 .endif
 
@@ -53,7 +53,7 @@
 post-build:
 	@${SED} -e 's,%%PREFIX%%,${PREFIX},' \
 		-e 's,%%LOCALBASE%%,${LOCALBASE},' \
-		-e 's,%%X11BASE%%,${X11BASE},' \
+		-e 's,%%X11BASE%%,${LOCALBASE},' \
 		-e 's,%%LTHREADSHMAJOR%%,${LTHREADSHMAJOR},' \
 		-e 's,%%LIBMAPCONF%%,${LIBMAPCONF},' \
 		< ${.CURDIR}/pkg-message > ${PKGMESSAGE}
@@ -63,12 +63,12 @@
 
 .if		defined(WITH_PLUGINS)
 pre-install:
-	@${MKDIR} ${X11BASE}/lib/browser_linux_plugins
+	@${MKDIR} ${LOCALBASE}/lib/browser_linux_plugins
 .if		defined(WITH_REALPLAYER)
-	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.so \
-		${X11BASE}/lib/browser_linux_plugins/
-	@${LN} -sf ${X11BASE}/lib/linux-mozilla/plugins/nphelix.xpt \
-		${X11BASE}/lib/browser_linux_plugins/
+	@${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.so \
+		${LOCALBASE}/lib/browser_linux_plugins/
+	@${LN} -sf ${LOCALBASE}/lib/linux-mozilla/plugins/nphelix.xpt \
+		${LOCALBASE}/lib/browser_linux_plugins/
 .endif
 .endif
 
Index: linuxpluginwrapper/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/linuxpluginwrapper/pkg-plist,v
retrieving revision 1.19
diff -u -r1.19 pkg-plist
--- linuxpluginwrapper/pkg-plist	14 Sep 2008 15:18:22 -0000	1.19
+++ linuxpluginwrapper/pkg-plist	13 Oct 2011 14:43:08 -0000
@@ -12,11 +12,11 @@
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD5-stable
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD5-current
 %%EXAMPLESDIR%%/libmap.conf-FreeBSD4.x
-@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nphelix.so
-@unexec	/bin/rm -f    %%X11BASE%%/lib/browser_linux_plugins/nphelix.xpt
-@unexec /bin/rmdir    %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null || true
-@exec   /bin/mkdir -p %%X11BASE%%/lib/browser_linux_plugins 2>/dev/null || true
-@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so                   %%X11BASE%%/lib/browser_linux_plugins/
-@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt                  %%X11BASE%%/lib/browser_linux_plugins/
+@unexec	/bin/rm -f    %%LOCALBASE%%/lib/browser_linux_plugins/nphelix.so
+@unexec	/bin/rm -f    %%LOCALBASE%%/lib/browser_linux_plugins/nphelix.xpt
+@unexec /bin/rmdir    %%LOCALBASE%%/lib/browser_linux_plugins 2>/dev/null || true
+@exec   /bin/mkdir -p %%LOCALBASE%%/lib/browser_linux_plugins 2>/dev/null || true
+@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.so                   %%LOCALBASE%%/lib/browser_linux_plugins/
+@exec	/bin/ln -sf %%LOCALBASE%%/lib/linux-mozilla/plugins/nphelix.xpt                  %%LOCALBASE%%/lib/browser_linux_plugins/
 @dirrm lib/pluginwrapper
 @dirrm %%EXAMPLESDIR%%
Index: moveable-type-fonts/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/x11-fonts/moveable-type-fonts/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- moveable-type-fonts/pkg-plist	3 Aug 2010 11:47:04 -0000	1.1
+++ moveable-type-fonts/pkg-plist	13 Oct 2011 14:43:08 -0000
@@ -25,4 +25,4 @@
 %%FONTSDIR%%/raleway_thin.ttf
 @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
Index: mpich2/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/mpich2/Makefile,v
retrieving revision 1.96
diff -u -r1.96 Makefile
--- mpich2/Makefile	23 Sep 2011 22:24:32 -0000	1.96
+++ mpich2/Makefile	13 Oct 2011 14:43:08 -0000
@@ -76,7 +76,7 @@
 WITHOUT_JAVA=	yes
 PLIST_SUB+=	X11="@comment "
 .else
-CONFIGURE_ARGS+=	--x-includes=${X11BASE}/include --x-libraries==${X11BASE}/lib
+CONFIGURE_ARGS+=	--x-includes=${LOCALBASE}/include --x-libraries==${LOCALBASE}/lib
 USE_XORG=	x11 xt
 PLIST_SUB+=	X11=${PLX11}
 .endif
Index: plan9port/Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/plan9port/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- plan9port/Makefile	2 Sep 2011 02:00:40 -0000	1.33
+++ plan9port/Makefile	13 Oct 2011 14:43:08 -0000
@@ -101,7 +101,7 @@
 post-patch:
 	@${FIND} ${WRKSRC}/man -type f -regex ".*\.[0-9?]$\" \
 		| ${XARGS} ${REINPLACE_CMD} -e 's|\\\*9|${PLAN9}|'
-	@${REINPLACE_CMD} -e 's|X11=/usr/X11R6|X11=${X11BASE}|' \
+	@${REINPLACE_CMD} -e 's|X11=/usr/X11R6|X11=${LOCALBASE}|' \
 		${WRKSRC}/bin/9l ${WRKSRC}/src/cmd/devdraw/mkwsysrules.sh
 	@${REINPLACE_CMD} -e 's|/lib/font/bit|${PLAN9}/font|' \
 		${WRKSRC}/src/cmd/acme/acme.c
Index: ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.696
diff -u -r1.696 bsd.port.mk
--- ports/Mk/bsd.port.mk	23 Sep 2011 22:20:46 -0000	1.696
+++ ports/Mk/bsd.port.mk	13 Oct 2011 14:43:08 -0000
@@ -535,8 +535,6 @@
 # Various directory definitions and variables to control them.
 # You rarely need to redefine any of these except WRKSRC and NO_WRKSUBDIR.
 #
-# X11BASE		- Where X11 ports install things.
-#				  Default: ${LOCALBASE}
 # LOCALBASE		- Where non-X11 ports install things.
 #				  Default: /usr/local
 # LINUXBASE		- Where Linux ports install things.
@@ -1120,7 +1118,6 @@
 # by individual Makefiles or local system make configuration.
 PORTSDIR?=		/usr/ports
 LOCALBASE?=		/usr/local
-X11BASE?=		${LOCALBASE}
 LINUXBASE?=		/compat/linux
 DISTDIR?=		${PORTSDIR}/distfiles
 _DISTDIR?=		${DISTDIR}/${DIST_SUBDIR}
@@ -1369,12 +1366,6 @@
 .include "${PORTSDIR}/Mk/bsd.linux-apps.mk"
 .endif
 
-.if ${X11BASE} != ${LOCALBASE}
-.BEGIN:
-	@${ECHO_MSG} "X11BASE is now deprecated.  Unset X11BASE in make.conf and try again."
-	@${FALSE}
-.endif
-
 .if defined(USE_XORG) || defined(XORG_CAT)
 .include "${PORTSDIR}/Mk/bsd.xorg.mk"
 .endif
@@ -1564,8 +1555,8 @@
 BUILD_WRKSRC?=	${WRKSRC}
 INSTALL_WRKSRC?=${WRKSRC}
 
-PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE}
-SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
+PLIST_SUB+=	OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} 
+SUB_LIST+=	PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
 		DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} \
 		WWWDIR=${WWWDIR} ETCDIR=${ETCDIR}
 
@@ -1938,9 +1929,9 @@
 
 .if defined(USE_DISPLAY) && !defined(DISPLAY)
 BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT} \
-	${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
-	${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} \
-	${X11BASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
+	${LOCALBASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT} \
+	${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT} \
+	${LOCALBASE}/share/X11/xkb/rules/base:${PORTSDIR}/x11/xkeyboard-config \
 	xkbcomp:${PORTSDIR}/x11/xkbcomp
 .if !defined(PACKAGE_BUILDING)
 CONFIGURE_ENV+=	DISPLAY="localhost:1001"
@@ -2100,15 +2091,15 @@
 .	if defined(USE_LINUX)
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-xorg-libs
 .	else
-BUILD_DEPENDS+=	${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
-RUN_DEPENDS+=	${X11BASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
+BUILD_DEPENDS+=	${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
+RUN_DEPENDS+=	${LOCALBASE}/libdata/xorg/libraries:${X_LIBRARIES_PORT}
 .	endif
 .endif
 
 .if defined(USE_XLIB) || defined(USE_XORG)
 # Add explicit X options to avoid problems with false positives in configure
 .if defined(GNU_CONFIGURE)
-CONFIGURE_ARGS+=--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include
+CONFIGURE_ARGS+=--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include
 .endif
 .endif
 
@@ -2196,7 +2187,7 @@
 MAKE_FLAGS?=	-f
 MAKEFILE?=		Makefile
 MAKE_ENV+=		PREFIX=${PREFIX} \
-			LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \
+			LOCALBASE=${LOCALBASE} \
 			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \
 			CC="${CC}" CFLAGS="${CFLAGS}" \
 			CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \
@@ -2438,7 +2429,7 @@
 # where pkg_add records its dirty deeds.
 PKG_DBDIR?=		/var/db/pkg
 
-MOTIFLIB?=	-L${X11BASE}/lib -lXm -lXp
+MOTIFLIB?=	-L${LOCALBASE}/lib -lXm -lXp
 
 ALL_TARGET?=		all
 INSTALL_TARGET?=	install
@@ -2949,8 +2940,7 @@
 SCRIPTS_ENV+=	CURDIR=${MASTERDIR} DISTDIR=${DISTDIR} \
 		  WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} PATCHDIR=${PATCHDIR} \
 		  SCRIPTDIR=${SCRIPTDIR} FILESDIR=${FILESDIR} \
-		  PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
-		  X11BASE=${X11BASE}
+		  PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} 
 
 .if defined(BATCH)
 SCRIPTS_ENV+=	BATCH=yes
@@ -3259,7 +3249,7 @@
 	  DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} WRKSRC=${WRKSRC} \
 	  PATCHDIR=${PATCHDIR} SCRIPTDIR=${SCRIPTDIR} \
 	  FILESDIR=${FILESDIR} PORTSDIR=${PORTSDIR} PREFIX=${PREFIX} \
-	  BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" X11BASE=${X11BASE} \
+	  BUILD_DEPENDS="${BUILD_DEPENDS}" RUN_DEPENDS="${RUN_DEPENDS}" \
 	  CONFLICTS="${CONFLICTS}" \
 	${ALL_HOOK}
 .endif
@@ -5760,7 +5750,7 @@
 .endif
 .if (${PREFIX} != "/usr")
 	@${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST}
-.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE})
+.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE})
 	@${ECHO_CMD} "@unexec rmdir %D/${INFO_PATH} 2>/dev/null || true" >> ${TMPPLIST}
 .endif
 .endif
@@ -5771,7 +5761,7 @@
 # deinstall-time
 .if !target(add-plist-post)
 add-plist-post:
-.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
+.if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
 	@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
 .else
 	@${DO_NADA}
Index: qt4-pgsql-plugin/files/Makefile.bsd
===================================================================
RCS file: /home/pcvs/ports/databases/qt4-pgsql-plugin/files/Makefile.bsd,v
retrieving revision 1.6
diff -u -r1.6 Makefile.bsd
--- qt4-pgsql-plugin/files/Makefile.bsd	4 Aug 2009 20:04:26 -0000	1.6
+++ qt4-pgsql-plugin/files/Makefile.bsd	13 Oct 2011 14:43:08 -0000
@@ -5,7 +5,7 @@
 		-I${QT_INCDIR} \
 		-I${QT_INCDIR}/Qt \
 		-I${LOCALBASE}/include/postgresql/server \
-		-I${LOCALBASE}/include -I${X11BASE}/include \
+		-I${LOCALBASE}/include \
 		${PTHREAD_CFLAGS} -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII \
 		-DQT_PLUGIN -DQT_SQL_LIB -DQT_CORE_LIB -D_LARGEFILE64_SOURCE \
 		-D_LARGEFILE_SOURCE -DQT_SHARED
Index: scrotwm/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11-wm/scrotwm/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- scrotwm/Makefile	16 Aug 2011 21:53:28 -0000	1.11
+++ scrotwm/Makefile	13 Oct 2011 14:43:08 -0000
@@ -37,10 +37,10 @@
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/scrotwm.*
 
 do-build:
-	${CC} ${CFLAGS} -I${X11BASE}/include \
-		-I${WRKSRC}/linux -lutil -L${X11BASE}/lib -lX11 -lXrandr -lXtst \
+	${CC} ${CFLAGS} -I${LOCALBASE}/include \
+		-I${WRKSRC}/linux -lutil -L${LOCALBASE}/lib -lX11 -lXrandr -lXtst \
 		-o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
-	${CC} ${CFLAGS} -I${X11BASE}/include -shared -fPIC \
+	${CC} ${CFLAGS} -I${LOCALBASE}/include -shared -fPIC \
 		-o ${WRKSRC}/libswmhack.so ${WRKSRC}/lib/swm_hack.c
 
 do-install:
Index: timidity++/Makefile.interface
===================================================================
RCS file: /home/pcvs/ports/audio/timidity++/Makefile.interface,v
retrieving revision 1.5
diff -u -r1.5 Makefile.interface
--- timidity++/Makefile.interface	23 Sep 2011 22:21:15 -0000	1.5
+++ timidity++/Makefile.interface	13 Oct 2011 14:43:08 -0000
@@ -117,11 +117,11 @@
 	${INSTALL_DATA} ${WRKSRC}/interface/timidity.el ${PREFIX}/${ELISPDIR}
 .endif
 .if ${INTERFACE} == "xaw"
-	@${MKDIR} ${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults
+	@${MKDIR} ${LOCALBASE}/lib/X11/${EUCJP_LOCALE}/app-defaults
 	${INSTALL_DATA} ${WRKSRC}/TiMidity.ad \
-		${X11BASE}/lib/X11/app-defaults/TiMidity
+		${LOCALBASE}/lib/X11/app-defaults/TiMidity
 	${INSTALL_DATA} ${WRKSRC}/TiMidity-uj.ad \
-		${X11BASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
+		${LOCALBASE}/lib/X11/${EUCJP_LOCALE}/app-defaults/TiMidity
 .endif
 .if defined(LINK)
 	${LN} -sf ${PREFIX}/bin/timidity ${PREFIX}/bin/${LINK}
Index: timidity++-motif/Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/timidity++-motif/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- timidity++-motif/Makefile	22 Mar 2007 16:59:23 -0000	1.8
+++ timidity++-motif/Makefile	13 Oct 2011 14:43:08 -0000
@@ -16,7 +16,7 @@
 
 post-configure:
 	@${MV} ${WRKSRC}/interface/Makefile ${WRKSRC}/interface/Makefile.orig
-	@${SED} -e 's^m_so_libs = $$^m_so_libs = -L${X11BASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \
+	@${SED} -e 's^m_so_libs = $$^m_so_libs = -L${LOCALBASE}/lib ${MOTIFLIB} -lXt -lXext -lSM -lICE -lX11 ^' \
 		-e 's^dynamic_targets = $$^dynamic_targets = interface_m.so^' \
 	${WRKSRC}/interface/Makefile.orig > ${WRKSRC}/interface/Makefile
 
Index: timidity++-xaw/pkg-plist
===================================================================
RCS file: /home/pcvs/ports/audio/timidity++-xaw/pkg-plist,v
retrieving revision 1.9
diff -u -r1.9 pkg-plist
--- timidity++-xaw/pkg-plist	22 Mar 2007 16:59:23 -0000	1.9
+++ timidity++-xaw/pkg-plist	13 Oct 2011 14:43:08 -0000
@@ -1,4 +1,4 @@
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
 lib/X11/app-defaults/TiMidity
 lib/X11/%%EUCJP_LOCALE%%/app-defaults/TiMidity
 @cwd %%REALPREFIX%%
@@ -18,6 +18,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.xaw
 %%PORTDOCS%%share/doc/ja/timidity++/README.xaw
 @dirrm %%TIMID_LIBDIR%%/bitmaps
-@cwd %%X11BASE%%
+@cwd %%LOCALBASE%%
 @dirrmtry lib/X11/%%EUCJP_LOCALE%%/app-defaults
 @dirrmtry lib/X11/%%EUCJP_LOCALE%%
Index: vnc/Makefile
===================================================================
RCS file: /home/pcvs/ports/net/vnc/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- vnc/Makefile	15 Sep 2011 19:55:52 -0000	1.74
+++ vnc/Makefile	13 Oct 2011 14:43:08 -0000
@@ -54,7 +54,7 @@
 
 RUN_DEPENDS+=	xauth:${PORTSDIR}/x11/xauth \
 		${PREFIX}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${X_FONTS_MISC_PORT} \
-		${X11BASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
+		${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${X_FONTS_ALIAS_PORT}
 
 USE_PERL5=	yes
 
Index: xephem/Makefile
===================================================================
RCS file: /home/pcvs/ports/astro/xephem/Makefile,v
retrieving revision 1.59
diff -u -r1.59 Makefile
--- xephem/Makefile	2 May 2011 12:41:42 -0000	1.59
+++ xephem/Makefile	13 Oct 2011 14:43:08 -0000
@@ -44,7 +44,7 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-		-e 's|/usr/X11R6|${X11BASE}|g' \
+		-e 's|/usr/X11R6|${LOCALBASE}|g' \
 		${WRKSRC}/Makefile
 	@${FIND} ${WRKSRC}/../.. -name Makefile -type f | \
 		${XARGS} ${REINPLACE_CMD} -e 's|CC =|CC?=|g ; \
Index: xmlcatmgr/Makefile
===================================================================
RCS file: /home/pcvs/ports/textproc/xmlcatmgr/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- xmlcatmgr/Makefile	22 Aug 2009 00:37:15 -0000	1.12
+++ xmlcatmgr/Makefile	13 Oct 2011 14:43:08 -0000
@@ -33,7 +33,7 @@
 
 post-build:
 	( ${ECHO} '#!/bin/sh'; \
-	${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${X11BASE}/bin'; \
+	${ECHO} 'PATH=$${PATH}:/bin:/usr/bin:${LOCALBASE}/bin:${LOCALBASE}/bin'; \
 	${ECHO} 'export PATH;'; \
 	) > ${COMMONVARS}
 .for V in XMLCATMGR CATALOG_MASTER_SGML CATALOG_MASTER_XML CATALOG_PORTS_SGML CATALOG_PORTS_XML
Index: xorg-libraries/pkg-install
===================================================================
RCS file: /home/pcvs/ports/x11/xorg-libraries/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- xorg-libraries/pkg-install	6 Jul 2007 00:23:20 -0000	1.2
+++ xorg-libraries/pkg-install	13 Oct 2011 14:43:08 -0000
@@ -7,7 +7,7 @@
 X11BASE=/usr/X11R6
 LOCALBASE=${LOCALBASE:-/usr/local}
 
-if [ ${X11BASE} -ef ${LOCALBASE} ]; then
+if [ ${LOCALBASE} -ef ${LOCALBASE} ]; then
 	echo "Spamming files in /etc..."
 else
 	exit 0
@@ -16,22 +16,22 @@
 # periodic.conf
 local_periodic=`. /etc/defaults/periodic.conf && source_periodic_confs ; echo ${local_periodic}`
 for lp in ${local_periodic}; do
-	if (expr ${lp} : "^${X11BASE}" >/dev/null); then
+	if (expr ${lp} : "^${LOCALBASE}" >/dev/null); then
 		continue
 	else
 		new_periodic="${new_periodic} ${lp}"
 	fi
 done
 if [ "${local_periodic}x" != "${new_periodic## }x" ]; then
-	echo "==> Removing ${X11BASE}/etc/periodic from periodic setup..."
+	echo "==> Removing ${LOCALBASE}/etc/periodic from periodic setup..."
 	echo "# added by xorg-libraries port" >> /etc/periodic.conf
 	echo "local_periodic=\"${new_periodic## }\"" >> /etc/periodic.conf
 	ppath_done=1
 fi
 
 # manpath.config
-if (PATH="/sbin:/bin:/usr/sbin:/usr/bin" manpath -q | grep -q "${X11BASE}");then	echo "==> Removing ${X11BASE}/man from MANPATH..."
-	sed -i ".bak.xorg" -e "s,^[^#]*${X11BASE}.*$,# (disabled by xorg-libraries port) &," \
+if (PATH="/sbin:/bin:/usr/sbin:/usr/bin" manpath -q | grep -q "${LOCALBASE}");then	echo "==> Removing ${LOCALBASE}/man from MANPATH..."
+	sed -i ".bak.xorg" -e "s,^[^#]*${LOCALBASE}.*$,# (disabled by xorg-libraries port) &," \
 	    /etc/manpath.config
 	mpath_done=1
 fi
@@ -39,14 +39,14 @@
 # rc.conf
 rcdirs=`. /etc/defaults/rc.conf && source_rc_confs && echo ${local_startup}`
 for rd in ${rcdirs}; do
-	if (expr ${rd} : "${X11BASE}" >/dev/null); then
+	if (expr ${rd} : "${LOCALBASE}" >/dev/null); then
 		continue
 	else
 		new_rcdirs="${new_rcdirs} ${rd}"
 	fi
 done
 if [ "${rcdirs}x" != "${new_rcdirs## }x" ]; then
-	echo "==> Removing ${X11BASE} from rc sequence..."
+	echo "==> Removing ${LOCALBASE} from rc sequence..."
 	echo "# added by xorg-libraries port" >> /etc/rc.conf
 	echo "local_startup=\"${new_rcdirs## }\"" >> /etc/rc.conf
 	rcconf_done=1
Index: xscreensaver/Makefile
===================================================================
RCS file: /home/pcvs/ports/x11/xscreensaver/Makefile,v
retrieving revision 1.118
diff -u -r1.118 Makefile
--- xscreensaver/Makefile	1 Oct 2011 06:05:36 -0000	1.118
+++ xscreensaver/Makefile	13 Oct 2011 14:43:08 -0000
@@ -67,7 +67,7 @@
 .endif
 
 .if defined(WITH_FIREF)
-RUN_DEPENDS+=	${X11BASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
+RUN_DEPENDS+=	${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies
 .endif
 .if defined(WITH_XAOS1)
 RUN_DEPENDS+=	xaos:${PORTSDIR}/graphics/xaos