5 files changed, 10 insertions, 13 deletions

diff --git a/deskutils/deskbar-applet/Makefile b/deskutils/deskbar-applet/Makefile
index 9887d170ba7f..1073f5aac0f4 100644
--- a/deskutils/deskbar-applet/Makefile
+++ b/deskutils/deskbar-applet/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	deskbar-applet
 PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -59,7 +59,7 @@ post-patch:
 	@${FIND} ${WRKSRC}/deskbar -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/share/applications|${LOCALBASE}/share/gnome/applications|g'
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g' \
+		s|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/deskbar/handlers/mozilla.py \
 		${WRKSRC}/deskbar/Utils.py
 
diff --git a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
index 773c8e15ae77..4c68b77664cc 100644
--- a/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
+++ b/deskutils/deskbar-applet/files/patch-deskbar_Utils.py
@@ -5,7 +5,7 @@
  	sysdirs = os.getenv("XDG_DATA_DIRS")
  	if sysdirs == None:
 -		sysdirs = "/usr/local/share:/usr/share"
-+	    sysdirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/"
++	    sysdirs = "/usr/local/share/gnome:/usr/local/share:/usr/share"
  	
  	dirs = "%s:%s" % (dirs, sysdirs)
  	return [dir for dir in dirs.split(":") if dir.strip() != "" and exists(dir)]
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index 5e0734b7b792..1c3002de896b 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		desktop-file-utils
 PORTVERSION=		0.12
+PORTREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		http://freedesktop.org/software/${PORTNAME}/releases/
 
@@ -25,9 +26,7 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 PKGINSTALL=		${WRKDIR}/pkg-install
 PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 
-PORT_MIMEDIRS=		${X11BASE}/share/applications \
-			${LOCALBASE}/share/applications \
-			${X11BASE}/share/gnome/applications \
+PORT_MIMEDIRS=		${LOCALBASE}/share/applications \
 			${LOCALBASE}/share/gnome/applications
 
 MIMEDIRS=		${PORT_MIMEDIRS} \
@@ -35,8 +34,7 @@ MIMEDIRS=		${PORT_MIMEDIRS} \
 			/usr/share/gnome/applications
 
 RMDIRS=			${PORT_MIMEDIRS} \
-			${LOCALBASE}/share/gnome \
-			${X11BASE}/share/gnome
+			${LOCALBASE}/share/gnome
 
 post-patch:
 	@${SED} -e 's|%%MIMEDIRS%%|${MIMEDIRS}| ;\
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index f61838718059..0be59c4073fe 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	glib
 PORTVERSION=	2.12.12
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -67,8 +67,7 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \
-		s|%%X11BASE%%|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/glib/gutils.c
 
 .include <bsd.port.post.mk>
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
index ad4210c2526f..8fd5f9ead041 100644
--- a/devel/glib20/files/patch-glib_gutils.c
+++ b/devel/glib20/files/patch-glib_gutils.c
@@ -5,7 +5,7 @@
  
        if (!data_dirs || !data_dirs[0])
 -          data_dirs = "/usr/local/share/:/usr/share/";
-+          data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/";
++          data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
  
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
@@ -14,7 +14,7 @@
  
        if (!conf_dirs || !conf_dirs[0])
 -          conf_dirs = "/etc/xdg";
-+          conf_dirs = "%%X11BASE%%/etc/xdg:/usr/local/etc/xdg:/etc/xdg";
++          conf_dirs = "/usr/local/etc/xdg:/etc/xdg";
  
        conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif