Sync w/ FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17059 df743ca5-7f9a-e211-a948-0013205c9059

22 files changed, 68 insertions, 686 deletions

diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 4d3fd2832..72515f2df 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -3,12 +3,12 @@
 # Whom:                 		ade, archie
 #
 # $FreeBSD$
-#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.210 2011/06/03 21:27:51 mezz Exp $
+#   $MCom: ports/x11-fm/nautilus/Makefile,v 1.211 2011/10/24 10:05:09 kwm Exp $
 #
 
 PORTNAME=	nautilus
 PORTVERSION=	2.32.2.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11-fm gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -31,9 +31,9 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
 		librsvg2 desktopfileutils ltverhack gvfs ltasneededhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
+CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -liconv" \
 		LIBPNG="-L${LOCALBASE}/lib -lpng -lz"
+CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--enable-static --disable-packagekit
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
deleted file mode 100644
index 82fa73a20..000000000
--- a/x11-fm/thunar/Makefile
+++ /dev/null
@@ -1,164 +0,0 @@
-# New ports collection makefile for:	thunar
-# Date created:		19.04.2006
-# Whom:			Oliver Lehmann <oliver@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Thunar
-PORTVERSION=	1.2.2
-PORTREVISION=	1
-CATEGORIES=	x11-fm xfce
-MASTER_SITES=	${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR=	src/xfce/${PORTNAME:L}/${PORTVERSION:R}
-DIST_SUBDIR=	xfce4
-
-MAINTAINER=	oliver@FreeBSD.org
-COMMENT=	XFce 4 file manager
-
-LIB_DEPENDS=	tumbler-1.0:${PORTSDIR}/deskutils/xfce4-tumbler
-
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS= yes
-USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_GMAKE=	yes
-USE_GNOME=	desktopfileutils gnomehack gtk20 intltool intlhack pkgconfig gdkpixbuf2
-USE_LDCONFIG=	yes
-USE_XFCE=	configenv libexo libmenu libutil
-USE_XORG=	sm x11
-
-OPTIONS=	DBUS		"Enable D-BUS support"				on  \
-		NLS		"Enable Native Language Support"		on  \
-		STARTUP		"Enable startup notification support"		on  \
-		NOTIFY		"Enable mount notifications support"		on  \
-		APIDOCS		"Install api documentation"			on  \
-		PLUG_APR	"Thunar Advanced Properties plugin"		on  \
-		PLUG_APR_EXIF	"Exif support for the APR plugin"		off \
-		PLUG_SBR	"Thunar Simple Builtin Renamers plugin"		on  \
-		PLUG_SBR_PCRE	"Regular expression support for the SBR plugin"	off \
-		PLUG_TPA	"Thunar Trash Panel Applet plugin"		on  \
-		PLUG_UCA	"Thunar User Customizable Actions plugin"	on  \
-		PLUG_WALL	"Thunar Wallpaper plugin"			on \
-		GVFS		"Add support for remote access"			on 
-
-CONFIGURE_ARGS+=	--disable-debug \
-		--enable-gio-unix \
-		--disable-gudev
-CONFIGURE_ENV+=	ac_cv_prog_AWK="${AWK}"
-
-MAN1=		Thunar.1
-
-.include  <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_DBUS)
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-CONFIGURE_ARGS+=--enable-dbus
-PLIST_SUB+=	WITH_DBUS=""
-.else
-CONFIGURE_ARGS+=--disable-dbus
-PLIST_SUB+=	WITH_DBUS="@comment "
-.endif
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if !defined(WITHOUT_NOTIFY)
-LIB_DEPENDS+=	notify.4:${PORTSDIR}/devel/libnotify
-CONFIGURE_ARGS+=--enable-notifications
-.else
-CONFIGURE_ARGS+=--disable-notifications
-.endif
-
-.if defined(WITHOUT_APIDOCS)
-CONFIGURE_ARGS+=	--without-html-dir
-PLIST_SUB+=	APIDOCS="@comment "
-.else
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	APIDOCS=""
-.endif
-
-.if !defined(WITHOUT_PLUG_APR)
-CONFIGURE_ARGS+=--enable-apr-plugin
-PLIST_SUB+=	PLUGIN_APR=""
-.if defined(WITH_PLUG_APR_EXIF)
-LIB_DEPENDS+=	exif.12:${PORTSDIR}/graphics/libexif
-CONFIGURE_ARGS+=--enable-exif
-.else
-CONFIGURE_ARGS+=--disable-exif
-.endif
-.else
-CONFIGURE_ARGS+=--disable-apr-plugin --disable-exif
-PLIST_SUB+=	PLUGIN_APR="@comment "
-.endif
-
-.if !defined(WITHOUT_PLUG_SBR)
-CONFIGURE_ARGS+=--enable-sbr-plugin
-PLIST_SUB+=	PLUGIN_SBR=""
-.if defined(WITH_PLUG_SBR_PCRE)
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
-CONFIGURE_ARGS+=--enable-pcre
-.else
-CONFIGURE_ARGS+=--disable-pcre
-.endif
-.else
-CONFIGURE_ARGS+=--disable-sbr-plugin --disable-pcre
-PLIST_SUB+=	PLUGIN_SBR="@comment "
-.endif
-
-.if !defined(WITHOUT_PLUG_TPA)
-CONFIGURE_ARGS+=--enable-tpa-plugin
-PLIST_SUB+=	PLUGIN_TPA=""
-USE_XFCE+=	panel
-.else
-CONFIGURE_ARGS+=--disable-tpa-plugin
-PLIST_SUB+=	PLUGIN_TPA="@comment "
-.endif
-
-.if !defined(WITHOUT_PLUG_UCA)
-CONFIGURE_ARGS+=--enable-uca-plugin
-PLIST_SUB+=	PLUGIN_UCA=""
-.else
-CONFIGURE_ARGS+=--disable-uca-plugin
-PLIST_SUB+=	PLUGIN_UCA="@comment "
-.endif
-
-.if !defined(WITHOUT_PLUG_WALL)
-CONFIGURE_ARGS+=--enable-wallpaper-plugin
-PLIST_SUB+=	PLUGIN_WALL=""
-.else
-CONFIGURE_ARGS+=--disable-wallpaper-plugin
-PLIST_SUB+=	PLUGIN_WALL="@comment "
-.endif
-
-.if !defined(WITHOUT_STARTUP)
-LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
-CONFIGURE_ARGS+=--enable-startup-notification
-.else
-CONFIGURE_ARGS+=--disable-startup-notification
-.endif
-
-.if defined(WITH_GVFS)
-USE_GNOME+=gvfs
-.endif
-
-.if (${OSVERSION} < 701000)
-CFLAGS+=	-DHAVE_SYS_MOUNT_H
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|docdir = .*|docdir = ${DOCSDIR}|' \
-		${WRKSRC}/docs/Makefile.in
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|enable_val|enableval|g' ${WRKSRC}/configure
-
-post-install:
-	@-update-desktop-database
-
-.include <bsd.port.post.mk>
diff --git a/x11-fm/thunar/distinfo b/x11-fm/thunar/distinfo
deleted file mode 100644
index 1169ec20b..000000000
--- a/x11-fm/thunar/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (xfce4/Thunar-1.2.2.tar.bz2) = 56b07dddde423ae7854c5edd433948a912c27afe2a60689ffc50df3d981e90f6
-SIZE (xfce4/Thunar-1.2.2.tar.bz2) = 4158257
diff --git a/x11-fm/thunar/pkg-descr b/x11-fm/thunar/pkg-descr
deleted file mode 100644
index 8660ec5c9..000000000
--- a/x11-fm/thunar/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Thunar is a new modern file manager for the Xfce Desktop Environment.
-Thunar has been designed from the ground up to be fast and easy-to-use.
-Its user interface is clean and intuitive, and does not include any
-confusing or useless options. Thunar is fast and responsive with a good
-start up time and directory load time. Thunar is accessible using
-Assistive Technologies and is fully standards compliant.
-
-WWW: http://thunar.xfce.org/
diff --git a/x11-fm/thunar/pkg-plist b/x11-fm/thunar/pkg-plist
deleted file mode 100644
index 0de136315..000000000
--- a/x11-fm/thunar/pkg-plist
+++ /dev/null
@@ -1,458 +0,0 @@
-bin/Thunar
-bin/thunar
-bin/thunar-settings
-%%PLUGIN_UCA%%etc/xdg/Thunar/uca.xml
-include/thunarx-2/thunarx/thunarx-config.h
-include/thunarx-2/thunarx/thunarx-file-info.h
-include/thunarx-2/thunarx/thunarx-menu-provider.h
-include/thunarx-2/thunarx/thunarx-preferences-provider.h
-include/thunarx-2/thunarx/thunarx-property-page-provider.h
-include/thunarx-2/thunarx/thunarx-property-page.h
-include/thunarx-2/thunarx/thunarx-provider-factory.h
-include/thunarx-2/thunarx/thunarx-provider-plugin.h
-include/thunarx-2/thunarx/thunarx-renamer-provider.h
-include/thunarx-2/thunarx/thunarx-renamer.h
-include/thunarx-2/thunarx/thunarx.h
-lib/Thunar/ThunarBulkRename
-lib/Thunar/ThunarHelp
-lib/Thunar/thunar-sendto-email
-lib/libthunarx-2.la
-lib/libthunarx-2.so
-lib/libthunarx-2.so.0
-%%PLUGIN_APR%%lib/thunarx-2/thunar-apr.la
-%%PLUGIN_APR%%lib/thunarx-2/thunar-apr.so
-%%PLUGIN_SBR%%lib/thunarx-2/thunar-sbr.la
-%%PLUGIN_SBR%%lib/thunarx-2/thunar-sbr.so
-%%PLUGIN_UCA%%lib/thunarx-2/thunar-uca.la
-%%PLUGIN_UCA%%lib/thunarx-2/thunar-uca.so
-%%PLUGIN_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.la
-%%PLUGIN_WALL%%lib/thunarx-2/thunar-wallpaper-plugin.so
-%%PLUGIN_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.la
-%%PLUGIN_TPA%%lib/xfce4/panel/plugins/libthunar-tpa.so
-libdata/pkgconfig/thunarx-2.pc
-share/Thunar/sendto/thunar-sendto-email.desktop
-share/applications/Thunar-bulk-rename.desktop
-share/applications/Thunar-folder-handler.desktop
-share/applications/Thunar.desktop
-share/applications/thunar-settings.desktop
-%%WITH_DBUS%%share/dbus-1/services/org.xfce.FileManager.service
-%%WITH_DBUS%%share/dbus-1/services/org.xfce.Thunar.service
-%%DOCSDIR%%/README.gtkrc
-%%DOCSDIR%%/README.thunarrc
-%%DOCSDIR%%/html/C/advanced-topics.html
-%%DOCSDIR%%/html/C/copyright.html
-%%DOCSDIR%%/html/C/customizing-thunar.html
-%%DOCSDIR%%/html/C/faq.html
-%%DOCSDIR%%/html/C/images/bulk-rename.png
-%%DOCSDIR%%/html/C/images/file-manager-window.png
-%%DOCSDIR%%/html/C/images/file-properties.png
-%%DOCSDIR%%/html/C/images/preferences-advanced.png
-%%DOCSDIR%%/html/C/images/preferences-behavior.png
-%%DOCSDIR%%/html/C/images/preferences-side-pane.png
-%%DOCSDIR%%/html/C/images/preferences-views.png
-%%DOCSDIR%%/html/C/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/C/images/removable-media-unmount.png
-%%DOCSDIR%%/html/C/images/sendto-menu.png
-%%DOCSDIR%%/html/C/images/visible-columns.png
-%%DOCSDIR%%/html/C/index.html
-%%DOCSDIR%%/html/C/preferences.html
-%%DOCSDIR%%/html/C/support.html
-%%DOCSDIR%%/html/C/the-file-manager-window.html
-%%DOCSDIR%%/html/C/using-removable-media.html
-%%DOCSDIR%%/html/C/working-with-files-and-folders.html
-%%DOCSDIR%%/html/bn/advanced-topics.html
-%%DOCSDIR%%/html/bn/copyright.html
-%%DOCSDIR%%/html/bn/customizing-thunar.html
-%%DOCSDIR%%/html/bn/faq.html
-%%DOCSDIR%%/html/bn/images
-%%DOCSDIR%%/html/bn/index.html
-%%DOCSDIR%%/html/bn/preferences.html
-%%DOCSDIR%%/html/bn/support.html
-%%DOCSDIR%%/html/bn/the-file-manager-window.html
-%%DOCSDIR%%/html/bn/using-removable-media.html
-%%DOCSDIR%%/html/bn/working-with-files-and-folders.html
-%%DOCSDIR%%/html/ca/advanced-topics.html
-%%DOCSDIR%%/html/ca/copyright.html
-%%DOCSDIR%%/html/ca/customizing-thunar.html
-%%DOCSDIR%%/html/ca/faq.html
-%%DOCSDIR%%/html/ca/images
-%%DOCSDIR%%/html/ca/index.html
-%%DOCSDIR%%/html/ca/preferences.html
-%%DOCSDIR%%/html/ca/support.html
-%%DOCSDIR%%/html/ca/the-file-manager-window.html
-%%DOCSDIR%%/html/ca/using-removable-media.html
-%%DOCSDIR%%/html/ca/working-with-files-and-folders.html
-%%DOCSDIR%%/html/da/advanced-topics.html
-%%DOCSDIR%%/html/da/copyright.html
-%%DOCSDIR%%/html/da/customizing-thunar.html
-%%DOCSDIR%%/html/da/faq.html
-%%DOCSDIR%%/html/da/images
-%%DOCSDIR%%/html/da/index.html
-%%DOCSDIR%%/html/da/preferences.html
-%%DOCSDIR%%/html/da/support.html
-%%DOCSDIR%%/html/da/the-file-manager-window.html
-%%DOCSDIR%%/html/da/using-removable-media.html
-%%DOCSDIR%%/html/da/working-with-files-and-folders.html
-%%DOCSDIR%%/html/es/advanced-topics.html
-%%DOCSDIR%%/html/es/copyright.html
-%%DOCSDIR%%/html/es/customizing-thunar.html
-%%DOCSDIR%%/html/es/faq.html
-%%DOCSDIR%%/html/es/images
-%%DOCSDIR%%/html/es/index.html
-%%DOCSDIR%%/html/es/preferences.html
-%%DOCSDIR%%/html/es/support.html
-%%DOCSDIR%%/html/es/the-file-manager-window.html
-%%DOCSDIR%%/html/es/using-removable-media.html
-%%DOCSDIR%%/html/es/working-with-files-and-folders.html
-%%DOCSDIR%%/html/el/advanced-topics.html
-%%DOCSDIR%%/html/el/copyright.html
-%%DOCSDIR%%/html/el/customizing-thunar.html
-%%DOCSDIR%%/html/el/faq.html
-%%DOCSDIR%%/html/el/images
-%%DOCSDIR%%/html/el/index.html
-%%DOCSDIR%%/html/el/preferences.html
-%%DOCSDIR%%/html/el/support.html
-%%DOCSDIR%%/html/el/the-file-manager-window.html
-%%DOCSDIR%%/html/el/using-removable-media.html
-%%DOCSDIR%%/html/el/working-with-files-and-folders.html
-%%DOCSDIR%%/html/eu/advanced-topics.html
-%%DOCSDIR%%/html/eu/copyright.html
-%%DOCSDIR%%/html/eu/customizing-thunar.html
-%%DOCSDIR%%/html/eu/faq.html
-%%DOCSDIR%%/html/eu/images
-%%DOCSDIR%%/html/eu/index.html
-%%DOCSDIR%%/html/eu/preferences.html
-%%DOCSDIR%%/html/eu/support.html
-%%DOCSDIR%%/html/eu/the-file-manager-window.html
-%%DOCSDIR%%/html/eu/using-removable-media.html
-%%DOCSDIR%%/html/eu/working-with-files-and-folders.html
-%%DOCSDIR%%/html/fr/advanced-topics.html
-%%DOCSDIR%%/html/fr/copyright.html
-%%DOCSDIR%%/html/fr/customizing-thunar.html
-%%DOCSDIR%%/html/fr/faq.html
-%%DOCSDIR%%/html/fr/images/bulk-rename.png
-%%DOCSDIR%%/html/fr/images/file-manager-window.png
-%%DOCSDIR%%/html/fr/images/file-properties.png
-%%DOCSDIR%%/html/fr/images/preferences-advanced.png
-%%DOCSDIR%%/html/fr/images/preferences-behavior.png
-%%DOCSDIR%%/html/fr/images/preferences-side-pane.png
-%%DOCSDIR%%/html/fr/images/preferences-views.png
-%%DOCSDIR%%/html/fr/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/fr/images/removable-media-unmount.png
-%%DOCSDIR%%/html/fr/images/sendto-menu.png
-%%DOCSDIR%%/html/fr/images/visible-columns.png
-%%DOCSDIR%%/html/fr/index.html
-%%DOCSDIR%%/html/fr/preferences.html
-%%DOCSDIR%%/html/fr/support.html
-%%DOCSDIR%%/html/fr/the-file-manager-window.html
-%%DOCSDIR%%/html/fr/using-removable-media.html
-%%DOCSDIR%%/html/fr/working-with-files-and-folders.html
-%%DOCSDIR%%/html/gl/advanced-topics.html
-%%DOCSDIR%%/html/gl/copyright.html
-%%DOCSDIR%%/html/gl/customizing-thunar.html
-%%DOCSDIR%%/html/gl/faq.html
-%%DOCSDIR%%/html/gl/images
-%%DOCSDIR%%/html/gl/index.html
-%%DOCSDIR%%/html/gl/preferences.html
-%%DOCSDIR%%/html/gl/support.html
-%%DOCSDIR%%/html/gl/the-file-manager-window.html
-%%DOCSDIR%%/html/gl/using-removable-media.html
-%%DOCSDIR%%/html/gl/working-with-files-and-folders.html
-%%DOCSDIR%%/html/id/advanced-topics.html
-%%DOCSDIR%%/html/id/copyright.html
-%%DOCSDIR%%/html/id/customizing-thunar.html
-%%DOCSDIR%%/html/id/faq.html
-%%DOCSDIR%%/html/id/images
-%%DOCSDIR%%/html/id/index.html
-%%DOCSDIR%%/html/id/preferences.html
-%%DOCSDIR%%/html/id/support.html
-%%DOCSDIR%%/html/id/the-file-manager-window.html
-%%DOCSDIR%%/html/id/using-removable-media.html
-%%DOCSDIR%%/html/id/working-with-files-and-folders.html
-%%DOCSDIR%%/html/it/advanced-topics.html
-%%DOCSDIR%%/html/it/copyright.html
-%%DOCSDIR%%/html/it/customizing-thunar.html
-%%DOCSDIR%%/html/it/faq.html
-%%DOCSDIR%%/html/it/images
-%%DOCSDIR%%/html/it/index.html
-%%DOCSDIR%%/html/it/preferences.html
-%%DOCSDIR%%/html/it/support.html
-%%DOCSDIR%%/html/it/the-file-manager-window.html
-%%DOCSDIR%%/html/it/using-removable-media.html
-%%DOCSDIR%%/html/it/working-with-files-and-folders.html
-%%DOCSDIR%%/html/ja/advanced-topics.html
-%%DOCSDIR%%/html/ja/copyright.html
-%%DOCSDIR%%/html/ja/customizing-thunar.html
-%%DOCSDIR%%/html/ja/faq.html
-%%DOCSDIR%%/html/ja/images/bulk-rename.png
-%%DOCSDIR%%/html/ja/images/file-manager-window.png
-%%DOCSDIR%%/html/ja/images/file-properties.png
-%%DOCSDIR%%/html/ja/images/preferences-advanced.png
-%%DOCSDIR%%/html/ja/images/preferences-behavior.png
-%%DOCSDIR%%/html/ja/images/preferences-side-pane.png
-%%DOCSDIR%%/html/ja/images/preferences-views.png
-%%DOCSDIR%%/html/ja/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/ja/images/removable-media-unmount.png
-%%DOCSDIR%%/html/ja/images/sendto-menu.png
-%%DOCSDIR%%/html/ja/images/visible-columns.png
-%%DOCSDIR%%/html/ja/index.html
-%%DOCSDIR%%/html/ja/preferences.html
-%%DOCSDIR%%/html/ja/support.html
-%%DOCSDIR%%/html/ja/the-file-manager-window.html
-%%DOCSDIR%%/html/ja/using-removable-media.html
-%%DOCSDIR%%/html/ja/working-with-files-and-folders.html
-%%DOCSDIR%%/html/nl/advanced-topics.html
-%%DOCSDIR%%/html/nl/copyright.html
-%%DOCSDIR%%/html/nl/customizing-thunar.html
-%%DOCSDIR%%/html/nl/faq.html
-%%DOCSDIR%%/html/nl/images
-%%DOCSDIR%%/html/nl/index.html
-%%DOCSDIR%%/html/nl/preferences.html
-%%DOCSDIR%%/html/nl/support.html
-%%DOCSDIR%%/html/nl/the-file-manager-window.html
-%%DOCSDIR%%/html/nl/using-removable-media.html
-%%DOCSDIR%%/html/nl/working-with-files-and-folders.html
-%%DOCSDIR%%/html/pl/advanced-topics.html
-%%DOCSDIR%%/html/pl/copyright.html
-%%DOCSDIR%%/html/pl/customizing-thunar.html
-%%DOCSDIR%%/html/pl/faq.html
-%%DOCSDIR%%/html/pl/images/bulk-rename.png
-%%DOCSDIR%%/html/pl/images/file-manager-window.png
-%%DOCSDIR%%/html/pl/images/file-properties.png
-%%DOCSDIR%%/html/pl/images/preferences-advanced.png
-%%DOCSDIR%%/html/pl/images/preferences-behavior.png
-%%DOCSDIR%%/html/pl/images/preferences-side-pane.png
-%%DOCSDIR%%/html/pl/images/preferences-views.png
-%%DOCSDIR%%/html/pl/images/removable-drives-and-media.png
-%%DOCSDIR%%/html/pl/images/removable-media-unmount.png
-%%DOCSDIR%%/html/pl/images/sendto-menu.png
-%%DOCSDIR%%/html/pl/images/visible-columns.png
-%%DOCSDIR%%/html/pl/index.html
-%%DOCSDIR%%/html/pl/preferences.html
-%%DOCSDIR%%/html/pl/support.html
-%%DOCSDIR%%/html/pl/the-file-manager-window.html
-%%DOCSDIR%%/html/pl/using-removable-media.html
-%%DOCSDIR%%/html/pl/working-with-files-and-folders.html
-%%DOCSDIR%%/html/ru/advanced-topics.html
-%%DOCSDIR%%/html/ru/copyright.html
-%%DOCSDIR%%/html/ru/customizing-thunar.html
-%%DOCSDIR%%/html/ru/faq.html
-%%DOCSDIR%%/html/ru/images
-%%DOCSDIR%%/html/ru/index.html
-%%DOCSDIR%%/html/ru/preferences.html
-%%DOCSDIR%%/html/ru/support.html
-%%DOCSDIR%%/html/ru/the-file-manager-window.html
-%%DOCSDIR%%/html/ru/using-removable-media.html
-%%DOCSDIR%%/html/ru/working-with-files-and-folders.html
-%%DOCSDIR%%/html/sv/advanced-topics.html
-%%DOCSDIR%%/html/sv/copyright.html
-%%DOCSDIR%%/html/sv/customizing-thunar.html
-%%DOCSDIR%%/html/sv/faq.html
-%%DOCSDIR%%/html/sv/images
-%%DOCSDIR%%/html/sv/index.html
-%%DOCSDIR%%/html/sv/preferences.html
-%%DOCSDIR%%/html/sv/support.html
-%%DOCSDIR%%/html/sv/the-file-manager-window.html
-%%DOCSDIR%%/html/sv/using-removable-media.html
-%%DOCSDIR%%/html/sv/working-with-files-and-folders.html
-%%DOCSDIR%%/html/thunar.css
-%%DOCSDIR%%/html/tr/advanced-topics.html
-%%DOCSDIR%%/html/tr/copyright.html
-%%DOCSDIR%%/html/tr/customizing-thunar.html
-%%DOCSDIR%%/html/tr/faq.html
-%%DOCSDIR%%/html/tr/images
-%%DOCSDIR%%/html/tr/index.html
-%%DOCSDIR%%/html/tr/preferences.html
-%%DOCSDIR%%/html/tr/support.html
-%%DOCSDIR%%/html/tr/the-file-manager-window.html
-%%DOCSDIR%%/html/tr/using-removable-media.html
-%%DOCSDIR%%/html/tr/working-with-files-and-folders.html
-%%DOCSDIR%%/html/ug/advanced-topics.html
-%%DOCSDIR%%/html/ug/copyright.html
-%%DOCSDIR%%/html/ug/customizing-thunar.html
-%%DOCSDIR%%/html/ug/faq.html
-%%DOCSDIR%%/html/ug/images
-%%DOCSDIR%%/html/ug/index.html
-%%DOCSDIR%%/html/ug/preferences.html
-%%DOCSDIR%%/html/ug/support.html
-%%DOCSDIR%%/html/ug/the-file-manager-window.html
-%%DOCSDIR%%/html/ug/using-removable-media.html
-%%DOCSDIR%%/html/ug/working-with-files-and-folders.html
-%%DOCSDIR%%/html/zh_CN/advanced-topics.html
-%%DOCSDIR%%/html/zh_CN/copyright.html
-%%DOCSDIR%%/html/zh_CN/customizing-thunar.html
-%%DOCSDIR%%/html/zh_CN/faq.html
-%%DOCSDIR%%/html/zh_CN/images
-%%DOCSDIR%%/html/zh_CN/index.html
-%%DOCSDIR%%/html/zh_CN/preferences.html
-%%DOCSDIR%%/html/zh_CN/support.html
-%%DOCSDIR%%/html/zh_CN/the-file-manager-window.html
-%%DOCSDIR%%/html/zh_CN/using-removable-media.html
-%%DOCSDIR%%/html/zh_CN/working-with-files-and-folders.html
-%%DOCSDIR%%/html/zh_TW/advanced-topics.html
-%%DOCSDIR%%/html/zh_TW/copyright.html
-%%DOCSDIR%%/html/zh_TW/customizing-thunar.html
-%%DOCSDIR%%/html/zh_TW/faq.html
-%%DOCSDIR%%/html/zh_TW/images
-%%DOCSDIR%%/html/zh_TW/index.html
-%%DOCSDIR%%/html/zh_TW/preferences.html
-%%DOCSDIR%%/html/zh_TW/support.html
-%%DOCSDIR%%/html/zh_TW/the-file-manager-window.html
-%%DOCSDIR%%/html/zh_TW/using-removable-media.html
-%%DOCSDIR%%/html/zh_TW/working-with-files-and-folders.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxFileInfo.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxMenuProvider.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPreferencesProvider.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPropertyPage.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxPropertyPageProvider.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxProviderFactory.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxProviderPlugin.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxRenamer.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/ThunarxRenamerProvider.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/abstraction.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/bulk-rename.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/home.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/index.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/index.sgml
-%%APIDOCS%%share/gtk-doc/html/thunarx/ix01.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/left.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/menu-provider.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/right.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/say-hello.png
-%%APIDOCS%%share/gtk-doc/html/thunarx/style.css
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-Variables-and-functions-to-check-the-library-version.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-abstraction-layer.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-fundamentals.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-overview.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-providers.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-using-extensions.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions-advanced-topics.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions-getting-started.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx-writing-extensions.html
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx.devhelp
-%%APIDOCS%%share/gtk-doc/html/thunarx/thunarx.devhelp2
-%%APIDOCS%%share/gtk-doc/html/thunarx/up.png
-share/icons/hicolor/16x16/apps/Thunar.png
-share/icons/hicolor/16x16/stock/navigation/stock_folder-copy.png
-share/icons/hicolor/16x16/stock/navigation/stock_folder-move.png
-share/icons/hicolor/16x16/stock/navigation/stock_thunar-shortcuts.png
-share/icons/hicolor/16x16/stock/navigation/stock_thunar-templates.png
-share/icons/hicolor/24x24/apps/Thunar.png
-share/icons/hicolor/24x24/stock/navigation/stock_folder-copy.png
-share/icons/hicolor/24x24/stock/navigation/stock_folder-move.png
-share/icons/hicolor/48x48/apps/Thunar.png
-share/icons/hicolor/scalable/apps/Thunar.svg
-%%NLS%%share/locale/ar/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ast/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/be/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/bn/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/da/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/de/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/dz/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/el/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/es/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/et/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/he/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/hr/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/id/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/it/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ka/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ku/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/lv/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/mk/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/pa/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/si/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/sq/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ug/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ur/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/ur_PK/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/Thunar.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/Thunar.mo
-share/pixmaps/Thunar/Thunar-about-logo.png
-%%PLUGIN_TPA%%share/xfce4/panel-plugins/thunar-tpa.desktop
-%%PLUGIN_TPA%%@dirrmtry share/xfce4/panel-plugins
-%%PLUGIN_TPA%%@dirrmtry share/xfce4
-@dirrm share/pixmaps/Thunar
-@exec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database >/dev/null || /usr/bin/true
-%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur_PK
-%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ur
-%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ug
-%%NLS%%@dirrmtry share/locale/sk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/sk
-%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/si
-%%NLS%%@dirrmtry share/locale/ku/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ku
-%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/kk
-%%NLS%%@dirrmtry share/locale/dz/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/dz
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast
-%%APIDOCS%%@dirrm share/gtk-doc/html/thunarx
-%%APIDOCS%%@dirrmtry share/gtk-doc/html
-%%APIDOCS%%@dirrmtry share/gtk-doc
-@dirrm %%DOCSDIR%%/html/zh_TW
-@dirrm %%DOCSDIR%%/html/zh_CN
-@dirrm %%DOCSDIR%%/html/ug
-@dirrm %%DOCSDIR%%/html/tr
-@dirrm %%DOCSDIR%%/html/sv
-@dirrm %%DOCSDIR%%/html/ru
-@dirrm %%DOCSDIR%%/html/pl/images
-@dirrm %%DOCSDIR%%/html/pl
-@dirrm %%DOCSDIR%%/html/nl
-@dirrm %%DOCSDIR%%/html/ja/images
-@dirrm %%DOCSDIR%%/html/ja
-@dirrm %%DOCSDIR%%/html/it
-@dirrm %%DOCSDIR%%/html/id
-@dirrm %%DOCSDIR%%/html/gl
-@dirrm %%DOCSDIR%%/html/fr/images
-@dirrm %%DOCSDIR%%/html/fr
-@dirrm %%DOCSDIR%%/html/eu
-@dirrm %%DOCSDIR%%/html/es
-@dirrm %%DOCSDIR%%/html/el
-@dirrm %%DOCSDIR%%/html/da
-@dirrm %%DOCSDIR%%/html/ca
-@dirrm %%DOCSDIR%%/html/bn
-@dirrm %%DOCSDIR%%/html/C/images
-@dirrm %%DOCSDIR%%/html/C
-@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
-@dirrm share/Thunar/sendto
-@dirrm share/Thunar
-@dirrmtry lib/thunarx-2
-@dirrm lib/Thunar
-@dirrm include/thunarx-2/thunarx
-@dirrm include/thunarx-2
-%%PLUGIN_UCA%%@dirrm etc/xdg/Thunar
-%%PLUGIN_UCA%%@dirrmtry etc/xdg
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index 84e4b3fcc..b516a73b5 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.136 2011/04/30 20:43:32 mezz Exp $
+#   $MCom: ports/x11-toolkits/libwnck/Makefile,v 1.137 2011/08/31 13:34:23 kwm Exp $
 #
 
 PORTNAME=	libwnck
@@ -34,8 +34,8 @@ USE_BISON=	build
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
 
diff --git a/x11-toolkits/pangomm/Makefile b/x11-toolkits/pangomm/Makefile
index a019a2640..d2e87919e 100644
--- a/x11-toolkits/pangomm/Makefile
+++ b/x11-toolkits/pangomm/Makefile
@@ -3,7 +3,7 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.22 2011/10/04 14:39:51 kwm Exp $
+#   $MCom: ports/x11-toolkits/pangomm/Makefile,v 1.23 2011/10/26 13:07:50 kwm Exp $
 #
 
 PORTNAME=	pangomm
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_GNOME=	gnomehack pango
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-documentation \
 		--enable-static=yes
 
diff --git a/x11-toolkits/unique/Makefile b/x11-toolkits/unique/Makefile
index 4dee8ed0d..8764622f6 100644
--- a/x11-toolkits/unique/Makefile
+++ b/x11-toolkits/unique/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/unique/Makefile,v 1.9 2010/06/29 21:14:06 kwm Exp $
+#   $MCom: ports/x11-toolkits/unique/Makefile,v 1.11 2011/10/24 08:10:28 kwm Exp $
 #
 
 PORTNAME=	unique
 PORTVERSION=	1.1.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME/sources/lib${PORTNAME}/${PORTVERSION:R}/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index 7edbbf19a..3719684c2 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Garrett Rooney <rooneg@electricjellyfish.net>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11-wm/metacity/Makefile,v 1.161 2011/06/10 22:16:59 mezz Exp $
 #
 
 PORTNAME=	metacity
 PORTVERSION=	2.30.3
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -29,8 +30,8 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix intlhack gnomehack gconf2 ltverhack gtk20
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
 GCONF_SCHEMAS=	metacity.schemas
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index 76aa4d176..f52032aa3 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,7 +3,7 @@
 # Whom:                Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gdm/Makefile,v 1.190 2011/06/25 14:53:53 mezz Exp $
+#   $MCom: ports/x11/gdm/Makefile,v 1.191 2012/08/16 14:25:44 kwm Exp $
 #
 
 PORTNAME=	gdm
@@ -48,10 +48,10 @@ GCONF_SCHEMAS=	gdm-simple-greeter.schemas
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-working-directory=${PREFIX}/etc/gdm/home \
 		--with-at-spi-registryd-directory=${LOCALBASE}/libexec
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAS_SA_LEN" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-lm" \
+CONFIGURE_ENV=	LIBS="-lm" \
 		GTKDOC="false"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAS_SA_LEN
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 SUB_FILES+=	gdm.pam
 
diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c
index 2305cd439..a15c91658 100644
--- a/x11/gdm/files/patch-daemon_gdm-session-worker.c
+++ b/x11/gdm/files/patch-daemon_gdm-session-worker.c
@@ -15,7 +15,7 @@
                           */
  
 -                        path = "/bin:/usr/bin:.";
-+                        path = "/bin:/usr/bin:/usr/local/bin:.";
++                        path = "/bin:/usr/bin:%%LOCALBASE%%/bin:.";
                  }
  
                  len = strlen (file) + 1;
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 48ef0b74d..89ce71ee4 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/x11/gnome-desktop/Makefile,v 1.192 2011/04/09 02:44:27 mezz Exp $
 #
 
 PORTNAME=	gnome-desktop
 PORTVERSION=	2.32.1
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -33,8 +33,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-gnome-distributor="FreeBSD GNOME Project" \
 		--disable-desktop-docs
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=	gnome-about.1
 
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
index 5d4f9acd4..a29eb650b 100644
--- a/x11/gnome-menus/Makefile
+++ b/x11/gnome-menus/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-menus/Makefile,v 1.117 2011/06/10 21:14:05 mezz Exp $
+#   $MCom: ports/x11/gnome-menus/Makefile,v 1.118 2011/10/23 10:23:05 kwm Exp $
 #
 
 PORTNAME=	gnome-menus
@@ -27,8 +27,8 @@ USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack glib20 ltverhack
 USE_AUTOTOOLS=	libtool
 USE_PYTHON=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu||' \
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 40d261367..0b92615cc 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-panel/Makefile,v 1.234 2011/06/03 21:27:51 mezz Exp $
+#   $MCom: ports/x11/gnome-panel/Makefile,v 1.235 2011/06/04 22:51:28 mezz Exp $
 #
 
 PORTNAME=	gnome-panel
 PORTVERSION=	2.32.1
-PORTREVISION?=	0
+PORTREVISION?=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -38,8 +38,8 @@ WANT_GNOME=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--disable-network-manager
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
-CPPFLAGS="-I${LOCALBASE}/include"
+LDFLAGS+=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 MAN1=		gnome-panel.1
 GCONF_SCHEMAS=	clock.schemas fish.schemas \
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index f923cb55d..a8b9299d5 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.123 2011/03/06 20:29:27 kwm Exp $
+#   $MCom: ports/x11/gnome-screensaver/Makefile,v 1.124 2011/04/09 16:54:20 mezz Exp $
 #
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	2.30.2
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -31,8 +31,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnomemenus libgnomekbd \
 CONFIGURE_ARGS=	--with-gdm-config=${LOCALBASE}/etc/gdm/custom.conf \
 		--with-xscreensaverdir=${XSCREENSAVER_DIR} \
 		--with-xscreensaverhackdir=${LOCALBASE}/bin/xscreensaver-hacks
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-screensaver.schemas
 MAN1=		gnome-screensaver-command.1 gnome-screensaver-preferences.1 \
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index a1e40e971..936f3b440 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-session/Makefile,v 1.190 2011/04/10 19:41:38 mezz Exp $
+#   $MCom: ports/x11/gnome-session/Makefile,v 1.191 2011/04/25 22:02:03 mezz Exp $
 #
 
 PORTNAME=	gnome-session
 PORTVERSION=	2.32.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -36,8 +36,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gconf2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docbook-docs
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gnome-session.1 gnome-wm.1 gnome-session-properties.1 \
 		gnome-session-save.1
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index c4a76a5b0..3e597a2f3 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome-terminal/Makefile,v 1.139 2011/04/25 22:05:10 mezz Exp $
+#   $MCom: ports/x11/gnome-terminal/Makefile,v 1.140 2011/04/30 20:43:30 mezz Exp $
 #
 
 PORTNAME=	gnome-terminal
 PORTVERSION=	2.32.1
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -27,8 +28,8 @@ USE_XORG=	sm
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 vte gnomedocutils \
 		libgnome
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-terminal.schemas
 
diff --git a/x11/gnome-terminal/files/patch-src-terminal.c b/x11/gnome-terminal/files/patch-src-terminal.c
new file mode 100644
index 000000000..a434ca7ab
--- /dev/null
+++ b/x11/gnome-terminal/files/patch-src-terminal.c
@@ -0,0 +1,11 @@
+--- src/terminal.c.orig	2010-11-10 10:47:14.000000000 -0800
++++ src/terminal.c	2012-03-23 21:10:08.520503912 -0700
+@@ -579,7 +579,7 @@
+     data = g_new (OwnData, 1);
+     data->factory_name = get_factory_name_for_display (display_name);
+     data->options = options;
+-    data->exit_code = -1;
++    data->exit_code = EXIT_SUCCESS;
+     data->argv = argv_copy;
+     data->argc = argc_copy;
+ 
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index e9f7ac3ea..482e11b5a 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnome2/Makefile,v 1.306 2011/04/30 20:43:30 mezz Exp $
+#   $MCom: ports/x11/gnome2/Makefile,v 1.307 2011/10/20 21:24:53 kwm Exp $
 #
 
 PORTNAME=	gnome2
 PORTVERSION=	2.32.1
-PORTREVISION?=	3
+PORTREVISION?=	5
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index c290ec0d8..224892b11 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -3,11 +3,12 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libgnomekbd/Makefile,v 1.53 2011/04/10 15:14:12 mezz Exp $
+#   $MCom: ports/x11/libgnomekbd/Makefile,v 1.54 2011/04/30 20:43:31 mezz Exp $
 #
 
 PORTNAME=	libgnomekbd
 PORTVERSION=	2.32.0
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -26,8 +27,8 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	desktop_gnome_peripherals_keyboard_xkb.schemas
 
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index 72a38240e..bd26f1694 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/libxklavier/Makefile,v 1.56 2012/06/14 04:17:30 mezz Exp $
+#   $MCom: ports/x11/libxklavier/Makefile,v 1.57 2012/06/14 12:27:01 kwm Exp $
 #
 
 PORTNAME=	libxklavier
@@ -33,8 +33,8 @@ CONFIGURE_ARGS=	--disable-doxygen \
 		--with-xmodmap-base=${LOCALBASE}/share/xmodmap \
 		--disable-gtk-doc \
 		--with-html-dir=${GNOME_HTML_DIR}
-CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 8bac04a7a..df6019439 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/yelp/Makefile,v 1.166 2011/04/11 07:29:02 kwm Exp $
+#   $MCom: ports/x11/yelp/Makefile,v 1.167 2011/04/30 20:43:31 mezz Exp $
 #
 
 PORTNAME=	yelp
 PORTVERSION=	2.30.2
-PORTREVISION=	1
+PORTREVISION=	4
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -30,8 +30,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gecko=${GECKO} \
 		--with-gecko-home=${LOCALBASE}/lib/${GECKO}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"