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)

41 files changed, 225 insertions, 152 deletions

diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile
index 6ee5631..6df009d 100644
--- a/x11/Terminal/Makefile
+++ b/x11/Terminal/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Matt Lancereau <ports@FreeBSD.org>
 #
 # $FreeBSD$
+#    $MCom: ports/x11/Terminal/Makefile,v 1.2 2006/10/08 00:20:31 mezz Exp $
 #
 
 PORTNAME=	Terminal
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 
@@ -20,7 +21,6 @@ LIB_DEPENDS=	exo-0.3:${PORTSDIR}/x11/libexo \
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 vte intlhack
-USE_X_PREFIX=	yes
 
 MAN1=		Terminal.1
 
diff --git a/x11/Terminal/pkg-plist b/x11/Terminal/pkg-plist
index b81391d..c1e1fb3 100644
--- a/x11/Terminal/pkg-plist
+++ b/x11/Terminal/pkg-plist
@@ -47,6 +47,7 @@ share/applications/Terminal.desktop
 share/icons/hicolor/48x48/apps/Terminal.png
 share/icons/hicolor/scalable/apps/Terminal.svg
 share/pixmaps/terminal.xpm
+@dirrmtry share/pixmaps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor
diff --git a/x11/alltray/Makefile b/x11/alltray/Makefile
index e445014..5c8603b 100644
--- a/x11/alltray/Makefile
+++ b/x11/alltray/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	alltray
 PORTVERSION=	0.69
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -35,8 +36,8 @@ USE_GNOME+=	gconf2
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||' ${WRKSRC}/lib/Makefile.in
 	@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||' ${WRKSRC}/src/Makefile.in
-	@${REINPLACE_CMD} -e 's|/etc/gconf|${X11BASE}/etc/gconf|; \
-		/THEME_DIR1/ s|/usr/share/|${X11BASE}/share/gnome/themes/|' \
+	@${REINPLACE_CMD} -e 's|/etc/gconf|${LOCALBASE}/etc/gconf|; \
+		/THEME_DIR1/ s|/usr/share/|${LOCALBASE}/share/gnome/themes/|' \
 		${WRKSRC}/src/gnome_theme.c
 	@${REINPLACE_CMD} -e 's|liballtray\.so\.0\.0\.0|liballtray.so.0|; \
 		s|/usr/lib|${PREFIX}/lib|' ${WRKSRC}/src/child.c
diff --git a/x11/fireflies/Makefile b/x11/fireflies/Makefile
index 57aeade..1d8886a 100644
--- a/x11/fireflies/Makefile
+++ b/x11/fireflies/Makefile
@@ -7,20 +7,22 @@
 
 PORTNAME=	fireflies
 PORTVERSION=	2.07
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://somewhere.fscked.org/fireflies/
 
 MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	Fireflies is a extention of xscreensaver
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 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_ARGS=	--with-bindir=${X11BASE}/bin/xscreensaver-hacks --with-confdir=${X11BASE}/share/xscreensaver/config
+CONFIGURE_ARGS=	--with-bindir=${LOCALBASE}/bin/xscreensaver-hacks \
+		--with-confdir=${LOCALBASE}/share/xscreensaver/config
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
diff --git a/x11/gcb/Makefile b/x11/gcb/Makefile
index 36d2fa6..1cf8e16 100644
--- a/x11/gcb/Makefile
+++ b/x11/gcb/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gcb
 PORTVERSION=	0.2.8
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://freebsd.flatrate.ru/distfiles/ \
 		http://ccbsd9.csie.nctu.edu.tw/~cp76/gcb/
@@ -16,7 +17,6 @@ COMMENT=	A GTK+ tool for managing x11 cut-buffers
 
 HAS_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gtk20
 
 .include <bsd.port.pre.mk>
diff --git a/x11/gcb/pkg-plist b/x11/gcb/pkg-plist
index 3d26629..c3bb494 100644
--- a/x11/gcb/pkg-plist
+++ b/x11/gcb/pkg-plist
@@ -1,5 +1,7 @@
 bin/gcb
-share/icons/gcb.png
 share/applications/gcb.desktop
+share/icons/gcb.png
 share/pixmaps/gcb.png
+@dirrmtry share/pixmaps
+@dirrmtry share/icons
 @dirrmtry share/applications
diff --git a/x11/gcursor/Makefile b/x11/gcursor/Makefile
index 3ec776c..b535b53 100644
--- a/x11/gcursor/Makefile
+++ b/x11/gcursor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gcursor
 PORTVERSION=	0.061
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://download.qballcow.nl/programs/gcursor/
 
@@ -17,7 +17,7 @@ COMMENT=	A mouse cursor theme selector for GNOME
 RUN_DEPENDS=	file-roller:${PORTSDIR}/archivers/file-roller
 
 USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
@@ -27,8 +27,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 DOCS=		AUTHORS COPYING ChangeLog INSTALL TODO
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/src/gcursor.c
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/gcursor.c
 	@${REINPLACE_CMD} -e 's|share/applications|share/gnome/applications|g' \
 		${WRKSRC}/data/Makefile.in
 
diff --git a/x11/gcursor/files/patch-src::gcursor.c b/x11/gcursor/files/patch-src::gcursor.c
index e5ee235..583eac0 100644
--- a/x11/gcursor/files/patch-src::gcursor.c
+++ b/x11/gcursor/files/patch-src::gcursor.c
@@ -1,6 +1,6 @@
---- src/gcursor.c.orig	Mon Sep 20 14:34:20 2004
-+++ src/gcursor.c	Mon Sep 20 14:34:25 2004
-@@ -32,29 +32,21 @@
+--- src/gcursor.c.orig	Thu Aug 26 05:35:55 2004
++++ src/gcursor.c	Thu Jul 27 13:25:46 2006
+@@ -32,29 +32,22 @@
  
  #warning move this into gconf
  char *paths[] = {
@@ -9,6 +9,7 @@
 -	"/usr/Xorg/lib/X11/icons/",
 -	"/usr/local/share/icons/",
 -	"/usr/share/icons/",
++	"%%LOCALBASE%%/lib/X11/icons/",
 +	"%%X11BASE%%/lib/X11/icons/",
  	"%s/.icons/",
  	NULL
@@ -38,7 +39,7 @@
  }
  
  
-@@ -85,7 +77,7 @@
+@@ -85,7 +78,7 @@
  			filename = g_shell_quote(gtk_file_selection_get_filename(GTK_FILE_SELECTION(fs)));
  #endif
  
@@ -47,7 +48,7 @@
  				filename);
  		g_free(filename);
  
-@@ -281,7 +273,7 @@
+@@ -281,7 +274,7 @@
  	
  	for (iterator = paths; *iterator; iterator++)
  	{
diff --git a/x11/gdesklets-tasklist/Makefile b/x11/gdesklets-tasklist/Makefile
index b755bb7..2d1625a 100644
--- a/x11/gdesklets-tasklist/Makefile
+++ b/x11/gdesklets-tasklist/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tasklist
 PORTVERSION=	0.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://gdesklets.zencomputer.ca/
 PKGNAMEPREFIX=	gdesklets-
@@ -18,7 +18,7 @@ COMMENT=	Displays the GNOME tasklist and floats above the other windows
 
 RUN_DEPENDS=	gdesklets:${PORTSDIR}/deskutils/gdesklets
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 
 NAME=		tasklist
 DATADIR=	${PREFIX}/share/gnome
diff --git a/x11/gnome-launch-box/Makefile b/x11/gnome-launch-box/Makefile
index 5a458b5..33799cb 100644
--- a/x11/gnome-launch-box/Makefile
+++ b/x11/gnome-launch-box/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnome-launch-box
 PORTVERSION=	20060112
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	jylefort
@@ -15,7 +16,6 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	An application launcher for the GNOME desktop
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libgnomeui evolutiondataserver gnomemenus gnomedesktop
 
diff --git a/x11/gnome-launch-box/files/patch-src_lb-module-evolution.c b/x11/gnome-launch-box/files/patch-src_lb-module-evolution.c
new file mode 100644
index 0000000..b0643f9
--- /dev/null
+++ b/x11/gnome-launch-box/files/patch-src_lb-module-evolution.c
@@ -0,0 +1,13 @@
+--- src/lb-module-evolution.c.orig	Sat Sep 30 02:32:56 2006
++++ src/lb-module-evolution.c	Sat Sep 30 02:33:58 2006
+@@ -258,8 +258,8 @@
+ 
+ 			g_print ("Loading image\n");
+ 			loader = gdk_pixbuf_loader_new ();
+-			gdk_pixbuf_loader_write (loader, photo->data, 
+-						 photo->length, NULL);
++			gdk_pixbuf_loader_write (loader, photo->data.inlined.data, 
++						 photo->data.inlined.length, NULL);
+ 			pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
+ 			if (pixbuf) {
+ 				g_object_set (item,
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 823eaf1..f66c3f4 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Yukihiro Nakai <Nakai@technologist.com>
 #
 # $FreeBSD$
+#   $MCom: ports/x11/gnome-libs/Makefile,v 1.2 2006/09/10 00:51:15 mezz Exp $
 #
 
 PORTNAME=	gnome-libs
 PORTVERSION=	1.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-libs/1.4
@@ -20,13 +21,13 @@ BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_XPM=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix esound gtk12 imlib libxml orbit
 USE_GETTEXT=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-test-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist
index bd53848..f9c1f0c 100644
--- a/x11/gnome-libs/pkg-plist
+++ b/x11/gnome-libs/pkg-plist
@@ -562,3 +562,39 @@ share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
 @dirrm include/gnome-1.0/libgnome
 @dirrm include/gnome-1.0/libart_lgpl
 @dirrm include/gnome-1.0/gtk-xmhtml
+@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/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sp/LC_MESSAGES
+@dirrmtry share/locale/sp
+@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
diff --git a/x11/gsynaptics/Makefile b/x11/gsynaptics/Makefile
index 8c25f6f..e62d0217 100644
--- a/x11/gsynaptics/Makefile
+++ b/x11/gsynaptics/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gsynaptics
 PORTVERSION=	0.9.9
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_JP}
 MASTER_SITE_SUBDIR=	gsynaptics/21527
@@ -15,10 +16,9 @@ MAINTAINER=	nork@FreeBSD.org
 COMMENT=	GNOME Synaptics Touchpad setting tool
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
-RUN_DEPENDS=	${PREFIX}/lib/modules/input/synaptics_drv.o:${PORTSDIR}/x11-servers/synaptics
+RUN_DEPENDS=	${X11BASE}/lib/modules/input/synaptics_drv.o:${PORTSDIR}/x11-servers/synaptics
 
 USE_GNOME=	lthack intlhack intltool pkgconfig gtk20 libgnome libglade2 libgnomeui
-USE_X_PREFIX=	yes
 USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/gsynaptics/pkg-plist b/x11/gsynaptics/pkg-plist
index 055dee0..9a54677 100644
--- a/x11/gsynaptics/pkg-plist
+++ b/x11/gsynaptics/pkg-plist
@@ -11,4 +11,9 @@ share/locale/zh_TW/LC_MESSAGES/gsynaptics.mo
 share/pixmaps/touchpad.png
 @dirrmtry share/gnome/autostart
 @dirrmtry share/applications
+@dirrmtry share/pixmaps
 @dirrm share/gsynaptics
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
diff --git a/x11/libcapplet/Makefile b/x11/libcapplet/Makefile
index b31e284..b27d814 100644
--- a/x11/libcapplet/Makefile
+++ b/x11/libcapplet/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Soboleb <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11/libcapplet/Makefile,v 1.4 2006/10/07 19:06:46 ahze Exp $
 
 PORTNAME=	libcapplet
 PORTVERSION=	1.4.0.5
-PORTREVISION=	3
+PORTREVISION=	7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	http://people.freebsd.org/~sobomax/
 DIST_SUBDIR=	gnome
@@ -16,11 +16,10 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A library for writing custom applets for GNOME Control Center
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GNOME=	gnomelibs
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GETOPT_LONG=yes
-MAKE_ENV=	X11BASE="${X11BASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	X11BASE="${LOCALBASE}" LOCALBASE="${LOCALBASE}" LDFLAGS="${LDFLAGS}"
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11/libcapplet/files/patch-Makefile b/x11/libcapplet/files/patch-Makefile
index caeb33b..72fec25 100644
--- a/x11/libcapplet/files/patch-Makefile
+++ b/x11/libcapplet/files/patch-Makefile
@@ -1,6 +1,14 @@
---- Makefile.orig	Wed Jul 10 05:32:05 2002
-+++ Makefile	Sun Jan 22 15:06:39 2006
-@@ -13,6 +13,6 @@
+--- Makefile.orig	Wed Jul 10 08:32:05 2002
++++ Makefile	Wed Oct  4 15:35:57 2006
+@@ -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 \
++	-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 \
 -	-lORBitutil -lglib12 -lwrap -lm -lgnorba -lXpm -ljpeg -lgnomeui \
 -	-lart_lgpl -lgdk_imlib -ltiff -lungif -lpng -lz -lSM -lICE -lgtk12 \
@@ -11,3 +19,5 @@
 +	-lgdk-12 -lgmodule-12 -lXext -lX11 -lgnome -lgnomesupport -lintl \
 +	-lesd ${LDFLAGS} -laudiofile 
  
+ CLEANFILES+=control-center-common.c control-center-skels.c \
+ 	    control-center-stubs.c control-center.h cappletConf.sh \
diff --git a/x11/libcapplet/files/patch-cappletConf.sh.in b/x11/libcapplet/files/patch-cappletConf.sh.in
index cc27c48..ee73029 100644
--- a/x11/libcapplet/files/patch-cappletConf.sh.in
+++ b/x11/libcapplet/files/patch-cappletConf.sh.in
@@ -1,7 +1,9 @@
---- cappletConf.sh.in.orig	Wed Jul 10 05:42:31 2002
-+++ cappletConf.sh.in	Sun Jan 22 21:22:31 2006
-@@ -1,3 +1,3 @@
+--- cappletConf.sh.in.orig	Wed Jul 10 08:42:31 2002
++++ cappletConf.sh.in	Sat Oct  7 15:03:42 2006
+@@ -1,4 +1,4 @@
  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_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%%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_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"
+ MODULE_VERSION="capplet-1.4.0.5"
diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile
index c6e3815..2ccbdbd 100644
--- a/x11/libexo/Makefile
+++ b/x11/libexo/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Matt Lancereau <ports@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11/libexo/Makefile,v 1.1 2006/10/02 21:05:55 ahze Exp $
 
 PORTNAME=	libexo
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://download.berlios.de/xfce-goodies/
 DISTNAME=	exo-${PORTVERSION}
@@ -21,7 +21,6 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-USE_X_PREFIX=	yes
 USE_LDCONFIG=	yes
 
 .if defined(WITH_GTKDOC)
diff --git a/x11/libgnomemm26/Makefile b/x11/libgnomemm26/Makefile
index 6b31a4b..6ec24e0 100644
--- a/x11/libgnomemm26/Makefile
+++ b/x11/libgnomemm26/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 Alexander Nedotsukov <bland@mail.ru>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnomemm26/Makefile,v 1.8 2006/04/13 07:52:41 bland Exp $
+#   $MCom: ports/x11/libgnomemm26/Makefile,v 1.10 2006/08/21 15:25:07 ahze Exp $
 #
 
 PORTNAME=	libgnomemm
-PORTVERSION=	2.14.0
+PORTVERSION=	2.16.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -22,12 +22,12 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 LATEST_LINK=	libgnomemm26
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_GCC=	3.4
 USE_GNOME=	gnomehack libgnome
 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/libgnomemm26/distinfo b/x11/libgnomemm26/distinfo
index b8a51c48..0b20f59 100644
--- a/x11/libgnomemm26/distinfo
+++ b/x11/libgnomemm26/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgnomemm-2.14.0.tar.bz2) = 8e31905b9732fdb099381569736829fa
-SHA256 (gnome2/libgnomemm-2.14.0.tar.bz2) = 66cc9f99f074bcc9c2c014880ff14d0e8ec15067fff0a9f6fe7ca79f65f65500
-SIZE (gnome2/libgnomemm-2.14.0.tar.bz2) = 250757
+MD5 (gnome2/libgnomemm-2.16.0.tar.bz2) = 2971eea9ebe6041735375e765322c51f
+SHA256 (gnome2/libgnomemm-2.16.0.tar.bz2) = 4a90c066a09539e159e1abfd2acbc189e814f558e4e0ef33e46b5fc8af57b2d5
+SIZE (gnome2/libgnomemm-2.16.0.tar.bz2) = 256478
diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile
index 571f977..58b9933 100644
--- a/x11/libxfce4mcs/Makefile
+++ b/x11/libxfce4mcs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxfce4mcs
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -20,8 +20,8 @@ COMMENT=	XFce 4 settings management library used by most XFce 4 modules
 
 LIB_DEPENDS=	xfce4util.1:${PORTSDIR}/x11/libxfce4util
 
+USE_XLIB=	yes
 USE_GNOME=	glib20 gnomehack
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile
index 9933971..cc734a3 100644
--- a/x11/libxfce4util/Makefile
+++ b/x11/libxfce4util/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libxfce4util
 PORTVERSION=	4.2.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 xfce
 MASTER_SITES=	http://www.us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
 		http://www.ca-us.xfce.org/archive/xfce-${PORTVERSION}/src/ \
@@ -19,7 +19,6 @@ MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	XFce 4 library with non-graphical helper functions
 
 USE_GNOME=	glib20 gnomehack
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
diff --git a/x11/libxfce4util/pkg-plist b/x11/libxfce4util/pkg-plist
index 3630a16..ed26fb1 100644
--- a/x11/libxfce4util/pkg-plist
+++ b/x11/libxfce4util/pkg-plist
@@ -51,4 +51,3 @@ share/xfce4/m4/i18n.m4
 @dirrmtry share/gtk-doc
 @dirrm share/xfce4/m4
 @dirrmtry share/xfce4
-@dirrmtry sbin
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 2b5cc7d..46030a6 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,30 +3,32 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11/libxklavier/Makefile,v 1.28 2006/09/10 00:51:15 mezz Exp $
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	2.2
-PORTREVISION=	1
+PORTVERSION=	2.91
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.2
-DIST_SUBDIR=	gnome2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	gswitchit
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An utility library to make XKB stuff easier
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gnomehack libxml2
-INSTALLS_SHLIB=	yes
+USE_GNOME=	gnometarget gnomehack libxml2 glib20
+USE_LDCONFIG=	yes
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
 		--with-xkb-base=${X11BASE}/lib/X11/xkb \
-		--with-xmodmap-base=${X11BASE}/share/gnome/xmodmap
+		--with-xmodmap-base=${LOCALBASE}/share/gnome/xmodmap \
+		--disable-gtk-doc \
+		--with-html-dir=${GNOME_HTML_DIR}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 22a33aa..8456fa5 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libxklavier-2.2.tar.gz) = a9c2e53ea96ed138b588df5a9b9addaf
-SHA256 (gnome2/libxklavier-2.2.tar.gz) = ccfa44ca1128018939906ef32b3a0e85a08efacbc00a32d49628fee7026cc2de
-SIZE (gnome2/libxklavier-2.2.tar.gz) = 467577
+MD5 (libxklavier-2.91.tar.gz) = 53d9864d165c86edb6a67f7ebe140814
+SHA256 (libxklavier-2.91.tar.gz) = 25c51adea53aed005d8b586289759e7402594d3326cd2f89bcdac54568c38f9b
+SIZE (libxklavier-2.91.tar.gz) = 455935
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c
index 6355d7b..d4b14ae 100644
--- a/x11/libxklavier/files/patch-libxklavier_xklavier.c
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c
@@ -1,11 +1,11 @@
---- libxklavier/xklavier.c.orig	Tue Dec 13 00:52:26 2005
-+++ libxklavier/xklavier.c	Tue Dec 13 00:52:45 2005
-@@ -606,7 +606,7 @@
-                             int level, const char format[], va_list args )
+--- libxklavier/xklavier.c.orig	Sat Apr 15 21:14:40 2006
++++ libxklavier/xklavier.c	Tue Jun 13 00:07:32 2006
+@@ -394,7 +394,7 @@ xkl_default_log_appender(const gchar fil
+ 			 gint level, const gchar format[], va_list args)
  {
-   time_t now = time( NULL );
--  fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file, function );
-+  fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", (long) now, level, file, function );
-   vfprintf( stdout, format, args );
+ 	time_t now = time(NULL);
+-	fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file,
++	fprintf(stdout, "[%08ld,%03d,%s:%s/] \t", (long)now, level, file,
+ 		function);
+ 	vfprintf(stdout, format, args);
  }
- 
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c
new file mode 100644
index 0000000..889c14b
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config.c
@@ -0,0 +1,15 @@
+--- libxklavier/xklavier_config.c	2006-04-15 22:04:38.000000000 -0400
++++ libxklavier/xklavier_config.c	2006-07-08 10:15:17.000000000 -0400
+@@ -275,7 +275,11 @@
+ gchar *
+ xkl_strings_concat_comma_separated(gchar ** array)
+ {
+-	return g_strjoinv(",", array);
++	if (array) {
++		return g_strjoinv(",", array);
++	} else {
++		return g_strdup("");
++	}
+ }
+ 
+ void
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
index 0ef1206..91d73cf 100644
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
@@ -1,11 +1,11 @@
---- libxklavier/xklavier_config_i18n.c.orig	Tue Nov 23 18:33:37 2004
-+++ libxklavier/xklavier_config_i18n.c	Tue Nov 23 18:34:30 2004
-@@ -106,7 +106,7 @@
-   iconv_t converter;
-   static char converted[XKL_MAX_CI_DESC_LENGTH];
-   char *convertedStart = converted;
--  char *utfStart = ( char * ) utf8string;
-+  const char *utfStart = ( const char * ) utf8string;
-   size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
-   const char *charset;
+--- libxklavier/xklavier_config_i18n.c.orig	Tue Jun 13 00:12:44 2006
++++ libxklavier/xklavier_config_i18n.c	Tue Jun 13 00:13:05 2006
+@@ -108,7 +108,7 @@ xkl_locale_from_utf8(const gchar * utf8s
+ 	iconv_t converter;
+ 	gchar converted[XKL_MAX_CI_DESC_LENGTH];
+ 	gchar *converted_start = converted;
+-	gchar *utf_start = (char *) utf8string;
++	const gchar *utf_start = (const char *) utf8string;
+ 	size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
+ 	const gchar *charset;
  
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c
deleted file mode 100644
index 8dbfe37..0000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- libxklavier/xklavier_evt_xmm.c.orig	Tue Nov 30 02:18:31 2004
-+++ libxklavier/xklavier_evt_xmm.c	Tue Nov 30 02:20:24 2004
-@@ -13,15 +13,15 @@
- {
-   if( _xklListenerType & XKLL_MANAGE_LAYOUTS )
-   {
--    XklDebug( 200, "Processing the KeyPress event\n" );
-     int currentShortcut = 0;
-     const XmmSwitchOptionPtr sop = _XklXmmFindSwitchOption( kpe->keycode, 
--                                                            kpe->state,
--                                                            &currentShortcut );
-+                                   kpe->state,
-+                                   &currentShortcut );
-+    XklDebug( 200, "Processing the KeyPress event\n" );
-     if( sop != NULL )
-     {
--      XklDebug( 150, "It is THE shortcut\n" );
-       XklState state;
-+      XklDebug( 150, "It is THE shortcut\n" );
-       _XklXmmGetRealState( &state );
-       if( state.group != -1 )
-       {
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
index 87dffde..a56ec78 100644
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_props.c
@@ -1,13 +1,15 @@
---- libxklavier/xklavier_props.c.orig	Mon Apr  3 14:49:17 2006
-+++ libxklavier/xklavier_props.c	Mon Apr  3 17:16:13 2006
-@@ -319,7 +324,9 @@ Bool XklGetNamesProp( Atom rulesAtom,
-             memcpy( var, varstart + 1, --varlen );
-             var[varlen] = '\0';
-             
--            ( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0';
-+            *theLayout = realloc (*theLayout, laylen + 1);
-+            (*theLayout)[laylen] = '\0';
-+            /*( (char*)realloc( *theLayout, laylen + 1 ) )[laylen] = '\0';*/
-           }
-         }
-       }
+--- libxklavier/xklavier_props.c.orig	Sun Apr 16 20:51:36 2006
++++ libxklavier/xklavier_props.c	Tue Jun 13 00:11:24 2006
+@@ -355,10 +355,8 @@ xkl_config_rec_get_from_root_window_prop
+ 					       --varlen);
+ 					var[varlen] = '\0';
+ 					/* Resize the original layout */
+-					((char *)
+-					 g_realloc(*layout,
+-						   laylen + 1))[laylen] =
+-					    '\0';
++					*layout = g_realloc(*layout, laylen + 1);
++					(*layout)[laylen] = '\0';
+ 				}
+ 			}
+ 			layout++;
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
deleted file mode 100644
index 0965857..0000000
--- a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libxklavier/xklavier_xmm.c.orig	Tue Dec 13 00:58:22 2005
-+++ libxklavier/xklavier_xmm.c	Tue Dec 13 00:58:47 2005
-@@ -66,7 +66,8 @@
- XmmSwitchOptionPtr _XklXmmGetCurrentShortcut( void )
- {
-   const char* optionName = _XklXmmGetCurrentShortcutOptionName();
--  XmmSwitchOptionPtr switchOption = allSwitchOptions;
-+  XmmSwitchOptionPtr switchOption;
-+  switchOption = allSwitchOptions;
-   XklDebug( 150, "Configured switch option: [%s]\n", optionName );
-   if( optionName == NULL )
-     return NULL;
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index d669618..8b2c1b1 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -1,10 +1,30 @@
 include/libxklavier/xklavier.h
-include/libxklavier/xklavier_config.h
+include/libxklavier/xkl_config_item.h
+include/libxklavier/xkl_config_rec.h
+include/libxklavier/xkl_config_registry.h
+include/libxklavier/xkl_engine.h
+include/libxklavier/xkl_engine_marshal.h
 lib/libxklavier.a
 lib/libxklavier.la
 lib/libxklavier.so
-lib/libxklavier.so.10
+lib/libxklavier.so.11
 libdata/pkgconfig/libxklavier.pc
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libxklavier-XklConfigItem.html
+%%DOCSDIR%%/libxklavier-XklConfigRec.html
+%%DOCSDIR%%/libxklavier-XklConfigRegistry.html
+%%DOCSDIR%%/libxklavier-XklEngine.html
+%%DOCSDIR%%/libxklavier-xklavier.html
+%%DOCSDIR%%/libxklavier.devhelp
+%%DOCSDIR%%/libxklavier.devhelp2
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 %%DATADIR%%/xfree86.xml
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
 @dirrm include/libxklavier
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index b61d28d..d4a229b 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -3,11 +3,11 @@
 # Whom:		 	Frederic Dubuy <fdubuy@free.fr>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11/multi-gnome-terminal/Makefile,v 1.1 2006/10/04 20:27:01 ahze Exp $
 
 PORTNAME=	multi-gnome-terminal
 PORTVERSION=	1.6.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	multignometerm
@@ -15,7 +15,6 @@ MASTER_SITE_SUBDIR=	multignometerm
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gnome tabbed terminal emulator
 
-USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
 USE_GNOME=	gnomehack gnomeprefix libglade
 USE_GMAKE=	yes
diff --git a/x11/multi-gnome-terminal/pkg-plist b/x11/multi-gnome-terminal/pkg-plist
index b546450..8b23fd5 100644
--- a/x11/multi-gnome-terminal/pkg-plist
+++ b/x11/multi-gnome-terminal/pkg-plist
@@ -185,4 +185,3 @@ share/gnome/pixmaps/multignometerm.png
 @dirrm share/gnome/help/multi-gnome-terminal/C/figures
 @dirrm share/gnome/help/multi-gnome-terminal/C
 @dirrm share/gnome/help/multi-gnome-terminal
-@unexec /bin/rmdir %D/sbin 2>/dev/null || /usr/bin/true
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index 351e826..a69ed7b 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Scott A. Moberly <smoberly@xavier.dyndns.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/x11/powershell/Makefile,v 1.1 2006/10/04 19:44:10 ahze Exp $
 
 PORTNAME=	powershell
 PORTVERSION=	0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A terminal emulator for the X11
 
-USE_X_PREFIX=	yes
-USE_GNOME=	gnomelibs
-USE_AUTOTOOLS=	autoconf:213
+USE_GNOME=	gnomelibs gnomehier
+USE_AUTOTOOLS=	autoconf:259
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include  `${IMLIB_CONFIG} --cflags`" \
 		LDFLAGS="-L${LOCALBASE}/lib  `${IMLIB_CONFIG} --libs`"
 ALL_TARGET=	${PORTNAME}
diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile
index b225967..7bd939a 100644
--- a/x11/xfce4-clipman-plugin/Makefile
+++ b/x11/xfce4-clipman-plugin/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-clipman-plugin
 PORTVERSION=	0.4.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11 xfce
 MASTER_SITES=	${MASTER_SITE_BERLIOS}
 MASTER_SITE_SUBDIR=	xfce-goodies
@@ -24,7 +24,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
 USE_LDCONFIG=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/xfce4-trigger-launcher/Makefile b/x11/xfce4-trigger-launcher/Makefile
index b2fb245..0acfdfd 100644
--- a/x11/xfce4-trigger-launcher/Makefile
+++ b/x11/xfce4-trigger-launcher/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xfce4-trigger-launcher
 PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 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 libxml2
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 
diff --git a/x11/xscreensaver-kde/Makefile b/x11/xscreensaver-kde/Makefile
index 0ef5ba1..2fe5497 100644
--- a/x11/xscreensaver-kde/Makefile
+++ b/x11/xscreensaver-kde/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xscreensaver-kde
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -33,9 +34,9 @@ LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if exists(${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop)
+.if exists(${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop)
 WITH_XSGNOME=	yes
-.elif exists(${X11BASE}/bin/screensaver)
+.elif exists(${LOCALBASE}/bin/screensaver)
 WITH_XSGNOME=	yes
 .else
 WITH_XS=	yes
@@ -47,8 +48,8 @@ RUN_DEPENDS+=	xscreensaver:${PORTSDIR}/x11/xscreensaver
 .endif # defined(WITH_XS)
 
 .if defined(WITH_XSGNOME)
-BUILD_DEPENDS+=	${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
-RUN_DEPENDS+=	${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+BUILD_DEPENDS+=	${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
+RUN_DEPENDS+=	${LOCALBASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome
 .endif # defined(WITH_XSGNOME)
 
 pre-configure:
diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile
index 90c4c59..5502d35 100644
--- a/x11/xscreensaver/Makefile
+++ b/x11/xscreensaver/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xscreensaver
 PORTVERSION=	5.01
+PORTREVISION=	3
 CATEGORIES?=	x11
 MASTER_SITES=	http://www.jwz.org/xscreensaver/ \
 		http://dougbarton.us/Downloads/
@@ -19,7 +20,6 @@ LIB_DEPENDS=	gle.4:${PORTSDIR}/graphics/gle \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		glade-2.0.0:${PORTSDIR}/devel/libglade2
 
-USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
@@ -108,7 +108,7 @@ post-patch:
 		${WRKSRC}/configure.Patched > ${WRKSRC}/configure
 
 post-install:
-	@(if test -x ${X11BASE}/bin/xscreensaver-hacks/webcollage-helper; then \
+	@(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \
 		${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \
 			${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \
 			${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi)
diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist
index a58e06f..1490260 100644
--- a/x11/xscreensaver/pkg-plist
+++ b/x11/xscreensaver/pkg-plist
@@ -211,7 +211,6 @@ bin/xscreensaver-hacks/xspirograph
 bin/xscreensaver-hacks/xsublim
 bin/xscreensaver-hacks/zoom
 bin/xscreensaver-text
-lib/X11/app-defaults/XScreenSaver
 share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/config/README
 %%DATADIR%%/config/anemone.xml
@@ -435,6 +434,9 @@ share/pixmaps/xscreensaver.xpm
 %%DATADIR%%/glade/screensaver-snap.png
 %%DATADIR%%/glade/xscreensaver-demo.glade2
 @dirrmtry bin/xscreensaver-hacks
+@dirrmtry share/pixmaps
 @dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/glade
 @dirrm %%DATADIR%%
+@cwd %%X11BASE%%
+lib/X11/app-defaults/XScreenSaver