Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the

new freetype2 where needed.

Submitted by:	mezz, ahze, pav, and many others
Approved by:	portmgr (implicit, kris)

20 files changed, 239 insertions, 71 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 273edcb5ba35..6224b250af40 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	icewm
 PORTVERSION=	1.2.28
+PORTREVISION=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 
@@ -112,9 +113,9 @@ post-patch:
 .endfor
 .for file in src/gnome2.cc
 	@${REINPLACE_CMD} -e \
-		's|/usr/share/control|${X11BASE}/share/gnome/control|g ; \
-		 s|/usr/share/app|${X11BASE}/share/gnome/app|g ; \
-		 s|/usr/share/gnome|${X11BASE}/share/gnome|g' ${WRKSRC}/${file}
+		's|/usr/share/control|${LOCALBASE}/share/gnome/control|g ; \
+		 s|/usr/share/app|${LOCALBASE}/share/gnome/app|g ; \
+		 s|/usr/share/gnome|${LOCALBASE}/share/gnome|g' ${WRKSRC}/${file}
 .endfor
 
 post-install:
diff --git a/x11-wm/pager/Makefile b/x11-wm/pager/Makefile
index 437c83136369..5c266eeee40f 100644
--- a/x11-wm/pager/Makefile
+++ b/x11-wm/pager/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pager
 PORTVERSION=	0.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://mirror2.unixfreunde.de/
@@ -16,14 +16,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ebert@informatik.unibw-muenchen.de
 COMMENT=	A pager for sawfish without GNOME
 
-BUILD_DEPENDS=	${X11BASE}/bin/sawfish:${PORTSDIR}/x11-wm/sawfish
-RUN_DEPENDS=	${X11BASE}/bin/sawfish:${PORTSDIR}/x11-wm/sawfish
+BUILD_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
+RUN_DEPENDS=	sawfish:${PORTSDIR}/x11-wm/sawfish
 
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 
-SAWFISH_VERSION=	`${X11BASE}/bin/sawfish --version 2>&1 | \
+SAWFISH_VERSION=	`${LOCALBASE}/bin/sawfish --version 2>&1 | \
 			${SED} 's/^.*version[ ]*\([0-9.]*\).*/\1/'`
 
 PLIST_SUB+=	SAWFISH_VERSION="${SAWFISH_VERSION}"
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index d0ed1c41e51e..e75f354ccf80 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -3,11 +3,11 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11-wm/sawfish/Makefile,v 1.1 2006/07/18 17:01:14 ahze Exp $
 
 PORTNAME=	sawfish
 PORTVERSION=	1.3
-PORTREVISION=	12
+PORTREVISION=	13
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -18,13 +18,13 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Lisp configurable window manager
 
 LIB_DEPENDS=	rep.12:${PORTSDIR}/lang/librep
-BUILD_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
-RUN_DEPENDS=	${X11BASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
+BUILD_DEPENDS=	${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
+RUN_DEPENDS=	${LOCALBASE}/libexec/rep/${GNUHOST}/gui/gtk-2/gtk.so:${PORTSDIR}/x11-toolkits/rep-gtk2
 
 GNUHOST=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 PLIST_SUB=	GNUHOST=${GNUHOST} VERSION=${PORTVERSION}
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehier gnomehack esound
 WANT_GNOME=	yes
diff --git a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
index 232fd5e6bc62..af4e2b49afb1 100644
--- a/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
+++ b/x11-wm/sawfish/files/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl
@@ -1,6 +1,3 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-wm/sawfish/files/Attic/patch-lisp::sawfish::ui::widgets::workspace-geometry.jl,v 1.1 2006-05-29 06:23:01 mezz Exp $
-
 --- lisp/sawfish/ui/widgets/workspace-geometry.jl	2002/04/29 19:16:50	1.1
 +++ lisp/sawfish/ui/widgets/workspace-geometry.jl	2002/04/29 19:17:07
 @@ -28,7 +28,6 @@
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 5dfcd8ffc5df..49a6645e91aa 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -680,3 +680,37 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 @dirrm libexec/sawfish/%%VERSION%%
 @dirrm libexec/sawfish
 @dirrm libexec/rep/%%GNUHOST%%/sawfish
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/no/LC_MESSAGES
+@dirrmtry share/locale/no
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 59132a7efbcb..e49d432c0d58 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Dominik Rothert <dr@domix.de>
 #
 # $FreeBSD$
+#    $MCom: ports/x11-wm/wmakerconf/Makefile,v 1.2 2006/10/05 07:31:44 mezz Exp $
 #
 
 PORTNAME=	wmakerconf
 PORTVERSION=	2.11
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://www.starplot.org/wmakerconf/
 
@@ -18,8 +19,9 @@ LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker
 RUN_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomehier gnometarget gtk20
+USE_GNOME=	gnometarget gtk20
 USE_PERL5=	yes
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wmakerdir="${X11BASE}/share/WindowMaker"
@@ -41,8 +43,8 @@ pre-configure:
 .endfor
 
 post-install:
-	@${MKDIR} ${PREFIX}/share/gnome/applications
+	@${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/wmakerconf.desktop \
-		${PREFIX}/share/gnome/applications
+		${PREFIX}/share/applications
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wmakerconf/pkg-plist b/x11-wm/wmakerconf/pkg-plist
index d429aa30d49c..1ad7c5741837 100644
--- a/x11-wm/wmakerconf/pkg-plist
+++ b/x11-wm/wmakerconf/pkg-plist
@@ -1,6 +1,6 @@
 bin/mkpreview
 bin/wmakerconf
-share/gnome/applications/wmakerconf.desktop
+share/applications/wmakerconf.desktop
 share/locale/ca/LC_MESSAGES/wmakerconf.mo
 share/locale/da/LC_MESSAGES/wmakerconf-data.mo
 share/locale/da/LC_MESSAGES/wmakerconf.mo
@@ -60,3 +60,4 @@ share/locale/tr/LC_MESSAGES/wmakerconf.mo
 %%DATADIR%%/wmakerconf.xpm
 %%DATADIR%%/workspace.xpm
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 3d7b282b8982..a014354a9952 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce
 PORTVERSION=	3.8.18
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,7 +17,6 @@ COMMENT=	CDE like desktop with GTK
 
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile
 
-USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gdkpixbuf
@@ -53,9 +52,9 @@ CONFIGURE_ARGS+=	--disable-xinerama
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/other/xinitrc.in
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${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|${X11BASE}|g' ${WRKSRC}/xfmenu/xfmenu.c
+		 s|/opt/gnome|${LOCALBASE}|g' ${WRKSRC}/xfmenu/xfmenu.c
 
 .include <bsd.port.post.mk>
diff --git a/x11-wm/xfce/pkg-plist b/x11-wm/xfce/pkg-plist
index 2aa984e566b7..6852e129079b 100644
--- a/x11-wm/xfce/pkg-plist
+++ b/x11-wm/xfce/pkg-plist
@@ -659,3 +659,23 @@ share/xfce/textures/stripe.xpm
 @dirrm share/xfce/backdrops
 @dirrm share/xfce
 @dirrm etc/xfce
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile
index 7093cb4683c7..3beaabb87991 100644
--- a/x11-wm/xfce4-desktop/Makefile
+++ b/x11-wm/xfce4-desktop/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-desktop
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -29,7 +29,6 @@ RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-desktop/pkg-plist b/x11-wm/xfce4-desktop/pkg-plist
index dcc0d3411969..e3fe67b7fc38 100644
--- a/x11-wm/xfce4-desktop/pkg-plist
+++ b/x11-wm/xfce4-desktop/pkg-plist
@@ -145,16 +145,13 @@ share/xfce4/doc/he/images/xfdesktop-menu-tab.png
 share/xfce4/doc/he/images/xfdesktop-list.png
 share/xfce4/doc/he/xfdesktop.html
 @dirrm etc/xdg/xfce4/desktop
+@dirrmtry share/pixmaps
 @dirrmtry share/applications
 @dirrmtry etc/xdg/xfce4
 @dirrmtry etc/xdg
 @dirrmtry etc/xfce4
 @dirrmtry lib/xfce4/mcs-plugins
 @dirrmtry lib/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
 @dirrm share/xfce4/backdrops
 @dirrmtry share/xfce4/doc/C/images
 @dirrmtry share/xfce4/doc/C
@@ -164,5 +161,39 @@ share/xfce4/doc/he/xfdesktop.html
 @dirrmtry share/xfce4/doc/he
 @dirrmtry share/xfce4/doc
 @dirrmtry share/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
 @dirrmtry share/locale/nb_NO/LC_MESSAGES
 @dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile
index b986e6dc042f..d9a72de184ec 100644
--- a/x11-wm/xfce4-panel/Makefile
+++ b/x11-wm/xfce4-panel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-panel
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20 gnomehack
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-panel/pkg-plist b/x11-wm/xfce4-panel/pkg-plist
index dca9a880b158..deca268261b4 100644
--- a/x11-wm/xfce4-panel/pkg-plist
+++ b/x11-wm/xfce4-panel/pkg-plist
@@ -169,10 +169,6 @@ share/xfce4/doc/he/xfce4-panel.html
 @dirrmtry lib/xfce4/panel-plugins
 @dirrmtry lib/xfce4
 @dirrmtry share/applications
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
 @dirrmtry share/xfce4/doc/C/images
 @dirrmtry share/xfce4/doc/C
 @dirrmtry share/xfce4/doc/fr/images
@@ -181,5 +177,39 @@ share/xfce4/doc/he/xfce4-panel.html
 @dirrmtry share/xfce4/doc/he
 @dirrmtry share/xfce4/doc
 @dirrmtry share/xfce4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
 @dirrmtry share/locale/nb_NO/LC_MESSAGES
 @dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile
index 138896ae584f..950c63e9d6fd 100644
--- a/x11-wm/xfce4-session/Makefile
+++ b/x11-wm/xfce4-session/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-session
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -27,7 +27,6 @@ RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager \
 
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB= yes
diff --git a/x11-wm/xfce4-session/pkg-plist b/x11-wm/xfce4-session/pkg-plist
index 83095fa3d67b..0ceaecfa6233 100644
--- a/x11-wm/xfce4-session/pkg-plist
+++ b/x11-wm/xfce4-session/pkg-plist
@@ -104,10 +104,6 @@ share/xfce4/doc/he/xfce4-session.html
 @dirrm include/xfce4/xfce4-session-4.2
 @dirrmtry include/xfce4
 @dirrmtry share/applications
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
 @dirrm share/themes/Default/balou
 @dirrmtry share/themes/Default
 @dirrmtry share/themes
@@ -124,3 +120,37 @@ share/xfce4/doc/he/xfce4-session.html
 @dirrmtry lib/xfce4/mcs-plugins
 @dirrmtry lib/xfce4
 @dirrmtry lib/pkgconfig
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/xfce4-systray/Makefile b/x11-wm/xfce4-systray/Makefile
index 20c2b4444d68..e30ba32867f4 100644
--- a/x11-wm/xfce4-systray/Makefile
+++ b/x11-wm/xfce4-systray/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-systray
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util \
 RUN_DEPENDS=	xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel
 
 USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile
index 196b84f565ba..d45df4530426 100644
--- a/x11-wm/xfce4-wm/Makefile
+++ b/x11-wm/xfce4-wm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-wm
 PORTVERSION=	4.2.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -26,7 +26,6 @@ RUN_DEPENDS=	xfce-mcs-manager:${PORTSDIR}/sysutils/xfce4-mcs-manager
 
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20
-USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-wm/xfce4-wm/pkg-plist b/x11-wm/xfce4-wm/pkg-plist
index 2e27d7f7fb90..df0a759b7edf 100644
--- a/x11-wm/xfce4-wm/pkg-plist
+++ b/x11-wm/xfce4-wm/pkg-plist
@@ -727,12 +727,6 @@ share/xfce4/doc/he/xfwm4.html
 share/xfwm4/defaults
 @dirrmtry lib/xfce4/mcs-plugins
 @dirrmtry lib/xfce4
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/nb_NO/LC_MESSAGES
-@dirrmtry share/locale/nb_NO
 @dirrmtry share/xfce4/doc/C/images
 @dirrmtry share/xfce4/doc/C
 @dirrmtry share/xfce4/doc/fr/images
@@ -759,3 +753,37 @@ share/xfwm4/defaults
 @dirrmtry share/themes/Wildbush
 @dirrmtry share/xfwm4/themes
 @dirrmtry share/xfwm4
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nb_NO/LC_MESSAGES
+@dirrmtry share/locale/nb_NO
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index bc23a12907f9..5073527b830e 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce
 PORTVERSION=	4.2.3.2
-PORTREVISION=	0
+PORTREVISION=	3
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -16,25 +16,25 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	The "meta-port" for the XFce 4 desktop environment
 
-RUN_DEPENDS=	${X11BASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/xfce4-mcs-plugins \
+RUN_DEPENDS=	${LOCALBASE}/lib/xfce4/mcs-plugins/ui_plugin.so:${PORTSDIR}/sysutils/xfce4-mcs-plugins \
 		xfwm4:${PORTSDIR}/x11-wm/xfce4-wm \
 		xfce4-appfinder:${PORTSDIR}/misc/xfce4-appfinder \
 		xfce4-session:${PORTSDIR}/x11-wm/xfce4-session \
 		xfce4-panel:${PORTSDIR}/x11-wm/xfce4-panel \
-		${X11BASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \
+		${LOCALBASE}/lib/xfce4/panel-plugins/libtriggerlauncher.so:${PORTSDIR}/x11/xfce4-trigger-launcher \
 		xfdesktop:${PORTSDIR}/x11-wm/xfce4-desktop \
 		startxfce4:${PORTSDIR}/sysutils/xfce4-utils \
 		xffm:${PORTSDIR}/x11-fm/xfce4-fm \
 		xfprint4:${PORTSDIR}/print/xfce4-print \
 		xfce4-iconbox:${PORTSDIR}/misc/xfce4-iconbox \
-		${X11BASE}/lib/gtk-2.0/2.4.0/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine
+		${LOCALBASE}/lib/gtk-2.0/${GTK2_VERSION}/engines/libxfce.so:${PORTSDIR}/x11-themes/gtk-xfce-engine
 
-.if exists(${X11BASE}/sbin/gdm)
+.if exists(${LOCALBASE}/sbin/gdm)
 WITH_GDM=	yes
 .endif
 
 .if defined(WITH_GDM)
-RUN_DEPENDS+=	${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm
+RUN_DEPENDS+=	${LOCALBASE}/sbin/gdm:${PORTSDIR}/x11/gdm
 PLIST_SUB+=	GDM=""
 .else
 PLIST_SUB+=	GDM="@comment "
@@ -42,28 +42,28 @@ PLIST_SUB+=	GDM="@comment "
 
 .if !defined(WITHOUT_EXTRAS)
 .if !defined(WITHOUT_THEMES)
-RUN_DEPENDS+=	${X11BASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme
+RUN_DEPENDS+=	${LOCALBASE}/share/xfce4/mime/Rodent.mime.xml:${PORTSDIR}/x11-themes/xfce4-icon-theme
 .endif
 
 .if !defined(WITHOUT_PLUGINS)
-RUN_DEPENDS+=	${X11BASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/xfce4-mixer \
-		${X11BASE}/lib/xfce4/panel-plugins/libsystray.so:${PORTSDIR}/x11-wm/xfce4-systray \
+RUN_DEPENDS+=	${LOCALBASE}/lib/xfce4/panel-plugins/libmixer.so:${PORTSDIR}/audio/xfce4-mixer \
+		${LOCALBASE}/lib/xfce4/panel-plugins/libsystray.so:${PORTSDIR}/x11-wm/xfce4-systray \
 		xfce4-tips:${PORTSDIR}/games/xfce4-toys
 .endif
 .endif
 
 LATEST_LINK=	xfce4
 NO_BUILD=	yes
-USE_X_PREFIX=	yes
+USE_GNOME=	gtk20
 
 do-install:	# empty
 
 post-install:
 .if defined(WITH_GDM)
-	@${TEST} -d ${X11BASE}/etc/gdm/Sessions || \
-		${MKDIR} -p ${X11BASE}/etc/gdm/Sessions
-	@${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${X11BASE}/etc/gdm/Sessions
-	@${INSTALL_DATA} ${FILESDIR}/XFce4.desktop ${X11BASE}/etc/dm/Sessions
+	@${TEST} -d ${LOCALBASE}/etc/gdm/Sessions || \
+		${MKDIR} -p ${LOCALBASE}/etc/gdm/Sessions
+	@${INSTALL_SCRIPT} ${FILESDIR}/XFce4 ${LOCALBASE}/etc/gdm/Sessions
+	@${INSTALL_DATA} ${FILESDIR}/XFce4.desktop ${LOCALBASE}/etc/dm/Sessions
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/xfce4/pkg-plist b/x11-wm/xfce4/pkg-plist
index f1b32f03f7d6..d8ef9ae74228 100644
--- a/x11-wm/xfce4/pkg-plist
+++ b/x11-wm/xfce4/pkg-plist
@@ -1,4 +1,4 @@
-%%GDM%%etc/dm/Sessions/XFce4.desktop
-%%GDM%%etc/gdm/Sessions/XFce4
-%%GDM%%@dirrmtry etc/gdm/Sessions
-%%GDM%%@dirrmtry etc/gdm
+%%GDM%%@unexec rm -f %%LOCAL1BASE%%/etc/dm/Sessions/XFce4.desktop
+%%GDM%%@unexec rm -f %%LOCALBASE%%/etc/gdm/Sessions/XFce4
+%%GDM%%@dirrmtry %%LOCALBASE%%/etc/gdm/Sessions
+%%GDM%%@dirrmtry %%LOCALBASE%%/etc/gdm