Sync with freebsd ports. portrevision bumping, getting CPPFLAGS/LDFLAGS from

CONFIGURE_ENV, s/CPPFLAGS=/CPPFLAGS+=/ etc Sprinkle USE_PKGCONFIG in some ports. Some small nits here and there. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17047 df743ca5-7f9a-e211-a948-0013205c9059
author: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> 2012-08-18 03:06:48 +0800
committer: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> 2012-08-18 03:06:48 +0800
commit: e1fad6b7b570f2f5685fb302a460b50679e04ae8 (patch)
tree: 6bdaaaa51925e10719a04696aa74e5d389db0195
parent: d6f2b76b19d2ae10403b675e549d5d5a8279079d (diff)
download: marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar
marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.gz
marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.bz2
marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.lz
marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.xz
marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.zst
marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.zip
56 files changed, 182 insertions, 191 deletions
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 8b438580a..4857605e3 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.119 2012/05/15 15:18:05 kwm Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.120 2012/08/04 21:04:24 kwm Exp $
 #
 
 PORTNAME=	atk
@@ -30,8 +30,8 @@ USE_GNOME=	gnomehier gnomehack glib20 ltverhack referencehack
 USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--enable-static \
 		--with-html-dir=${PREFIX}/share/doc
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 		AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
 
 post-patch:
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 86c327389..0f89d91fd 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Anders Nordby <anders@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.187 2011/06/03 21:27:49 mezz Exp $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.188 2011/06/11 18:55:56 mezz Exp $
 #
 
 PORTNAME=	file-roller
 PORTVERSION=	2.32.1
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	archivers gnome
 MASTER_SITES=	GNOME
@@ -31,8 +32,8 @@ USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
 		gtk20 gconf2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-packagekit
 
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index ebe6b82ad..595160d8b 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-media/Makefile,v 1.161 2011/06/11 18:55:56 mezz Exp $
+#   $MCom: ports/audio/gnome-media/Makefile,v 1.162 2011/10/22 22:30:14 kwm Exp $
 #
 
 PORTNAME=	gnome-media
 PORTVERSION=	2.32.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -32,8 +32,8 @@ USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libxml2 gconf2
 USE_GSTREAMER=	gconf good
 CONFIGURE_ARGS=	--disable-gstmix
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gnome-audio-profiles.schemas \
 		gnome-sound-recorder.schemas
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index b6f8d326a..8ab7b4297 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/libcanberra/Makefile,v 1.28 2011/06/11 18:55:56 mezz Exp $
+#   $MCom: ports/audio/libcanberra/Makefile,v 1.29 2012/04/27 13:28:44 kwm Exp $
 
 PORTNAME=	libcanberra
 PORTVERSION=	0.28
-PORTREVISION=	1
+PORTREVISION=	4
 CATEGORIES=	audio devel
 MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 
@@ -23,8 +23,8 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ARGS=	--disable-lynx --disable-tdb --disable-alsa
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(SLAVEPORT)
 GCONF_SCHEMAS=	libcanberra.schemas
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 65f0ec586..bb3d9515c 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.156 2011/12/06 13:43:48 kwm Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.157 2012/05/31 15:11:23 kwm Exp $
 #
 
 PORTNAME=	gnome-utils
 PORTVERSION=	2.32.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
@@ -32,8 +33,8 @@ INSTALLS_ICONS=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel ltverhack
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--enable-maintainer-flags=no
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gnome-dictionary.1 gnome-screenshot.1 gnome-search-tool.1 \
 		gnome-system-log.1 baobab.1
diff --git a/deskutils/gucharmap/Makefile b/deskutils/gucharmap/Makefile
index 3ac3c82f4..0217585cd 100644
--- a/deskutils/gucharmap/Makefile
+++ b/deskutils/gucharmap/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.78 2011/04/30 20:43:14 mezz Exp $
+#   $MCom: ports/deskutils/gucharmap/Makefile,v 1.79 2011/06/11 19:51:12 mezz Exp $
 #
 
 PORTNAME=	gucharmap
@@ -26,8 +26,8 @@ USE_GNOME=	gnomeprefix intlhack gnomehack gtk20 gnomedocutils gconf2
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gucharmap.schemas
 
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index cd60c1ae8..1f5221a69 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/devhelp/Makefile,v 1.42 2011/04/30 20:43:15 mezz Exp $
+#   $MCom: ports/devel/devhelp/Makefile,v 1.43 2011/06/11 19:51:13 mezz Exp $
 
 PORTNAME=	devhelp
 PORTVERSION=	2.32.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -31,8 +31,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 GCONF_SCHEMAS=	devhelp.schemas
-CPPFLAGS=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib"
+CPPFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
 
 OPTIONS=	GEDIT "Enable GEdit plug-in support" off
 
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index ac81d41b3..59db7c916 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gsettings-desktop-schemas/Makefile,v 1.18 2012/05/16 15:28:36 kwm Exp $
+#   $MCom: ports/devel/gsettings-desktop-schemas/Makefile,v 1.19 2012/08/04 16:55:24 kwm Exp $
 #
 
 PORTNAME=	gsettings-desktop-schemas
@@ -24,7 +24,7 @@ RUN_DEPENDS=	${LOCALBASE}/etc/fonts/conf.avail/31-cantarell.conf:${PORTSDIR}/x11
 USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_PERL_BUILD=	yes
+USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack intltool glib20
 USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index 827cb591c..7722fc78f 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 		Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/json-glib/Makefile,v 1.19 2011/09/19 18:50:13 kwm Exp $
+#   $MCom: ports/devel/json-glib/Makefile,v 1.20 2011/10/26 13:14:50 kwm Exp $
 #
 
 PORTNAME=	json-glib
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-i
 USE_GMAKE=	yes
 USE_XZ=		yes
 USE_GNOME=	glib20 gnomehack gnomeprefix ltverhack
+USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index d9a9e6479..32bad900c 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgdata/Makefile,v 1.23 2012/05/02 07:13:11 kwm Exp $
+#   $MCom: ports/devel/libgdata/Makefile,v 1.24 2012/05/27 14:03:58 kwm Exp $
 #
 
 PORTNAME=	libgdata
@@ -17,7 +17,7 @@ COMMENT=	GLib based implimentation of the GData protocol
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
 LIB_DEPENDS=	soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
-		oauth.8:${PORTSDIR}/net/liboauth
+		oauth:${PORTSDIR}/net/liboauth
 RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
 
 CONFLICTS=	libgdata-0.6.*
@@ -28,10 +28,10 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack intltool ltverhack glib20
+USE_GNOME=	gnomeprefix gnomehack intltool ltverhack glib20
+USE_PKGCONFIG=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=--with-html-dir="${PREFIX}/share/doc" \
-		--with-ca-certs=${LOCALBASE}/share/certs/ca-root-nss.crt
+CONFIGURE_ARGS+=--with-ca-certs=${LOCALBASE}/share/certs/ca-root-nss.crt
 
 .include <bsd.port.mk>
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index 1ce67bc18..41ceaf424 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -19,7 +19,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection=yes
 USE_GMAKE=	yes
 USE_XZ=		yes
-USE_GNOME=	glib20 gnomehier gnomehack gnomehier
+USE_GNOME=	glib20 gnomehier gnomehack
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index beb7faf2b..3f5f0bb08 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop/Makefile,v 1.56 2010/05/02 00:04:47 marcus Exp $
+#   $MCom: ports/devel/libgtop/Makefile,v 1.58 2011/08/30 20:55:55 kwm Exp $
 #
 
 PORTNAME=	libgtop
@@ -22,13 +22,11 @@ USE_PERL5_BUILD=yes
 USE_XORG=	xau
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 ltverhack intlhack
+USE_GNOME=	gnomeprefix gnomehack glib20 ltverhack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ARGS=	--disable-gtk-doc \
-		--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_NET_IF_VAR_H
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 INFO=		libgtop2
 
diff --git a/devel/liboobs/Makefile b/devel/liboobs/Makefile
index fc285387a..ab6888da0 100644
--- a/devel/liboobs/Makefile
+++ b/devel/liboobs/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/liboobs/Makefile,v 1.52 2011/04/04 09:31:41 kwm Exp $
+#   $MCom: ports/devel/liboobs/Makefile,v 1.53 2011/06/11 19:51:15 mezz Exp $
 #
 
 PORTNAME=	liboobs
@@ -23,10 +23,10 @@ RUN_DEPENDS=	${LOCALBASE}/etc/dbus-1/system.d/org.freedesktop.SystemToolsBackend
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack glib20
+USE_GNOME=	gnomeprefix gnomehack glib20
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc --with-hal
-CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ARGS=	--with-hal
+CPPFLAGS+=	-I${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index cfeec1497..11a2e7abf 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.55 2011/10/07 10:06:54 kwm Exp $
+#   $MCom: ports/devel/py-gobject/Makefile,v 1.56 2011/10/07 13:30:13 kwm Exp $
 #
 
 PORTNAME=	gobject
@@ -20,7 +20,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GObject
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 		${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index 8893f5c5f..2e38f4240 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Alexander Logvinov <avl@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/seed/Makefile,v 1.32 2012/02/07 15:36:54 kwm Exp $
+#   $MCom: ports/devel/seed/Makefile,v 1.33 2012/08/08 16:56:39 kwm Exp $
 #
 # NOTE: It may be necessary to update ${FILESDIR}/Seed.js on each release.
 # To do that, just replace imports.searchPaths with "." and ".." elements.
@@ -36,8 +36,8 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_SQLITE=	yes
 USE_GMAKE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-gtk-doc=no --with-webkit=1.0
 
 MAN1=		seed.1
diff --git a/editors/gedit-plugins/Makefile b/editors/gedit-plugins/Makefile
index 3ca3b0c10..9bb7bf0c6 100644
--- a/editors/gedit-plugins/Makefile
+++ b/editors/gedit-plugins/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.51 2011/04/30 20:43:16 mezz Exp $
+#   $MCom: ports/editors/gedit-plugins/Makefile,v 1.52 2011/06/30 04:23:55 mezz Exp $
 #
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	2.32.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -30,8 +30,8 @@ USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack gnomeprefix intlhack gnomevfs2
 WANT_GNOME=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gedit-show-tabbar-plugin.schemas \
 		gedit-drawspaces.schemas
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index f88ea288c..3842ff154 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/gedit/Makefile,v 1.129 2011/06/03 21:27:49 mezz Exp $
+#   $MCom: ports/editors/gedit/Makefile,v 1.130 2011/06/30 04:23:55 mezz Exp $
 #
 
 PORTNAME=	gedit
 PORTVERSION=	2.30.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -33,8 +33,8 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gtksourceview2 \
 		desktopfileutils gnomedocutils ltasneededhack
 WANT_GNOME=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 PLIST_SUB=	VERSION="2.20"
 
 MAN1=		gedit.1
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 344c35e23..09cfafcac 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/editors/ghex/Makefile,v 1.13 2008/08/23 18:22:59 mezz Exp $
+#   $MCom: ports/editors/ghex/Makefile,v 1.15 2011/10/15 16:35:30 kwm Exp $
 #
 
 PORTNAME=	ghex
 PORTVERSION=	2.24.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/graphics/eog-plugins/Makefile b/graphics/eog-plugins/Makefile
index 9e52437be..d17998ba4 100644
--- a/graphics/eog-plugins/Makefile
+++ b/graphics/eog-plugins/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog-plugins/Makefile,v 1.18 2011/08/24 13:49:30 kwm Exp $
+#   $MCom: ports/graphics/eog-plugins/Makefile,v 1.19 2011/08/24 16:05:56 kwm Exp $
 #
 
 PORTNAME=	eog-plugins
 PORTVERSION=	2.30.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -17,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plug-ins for the Eye of GNOME image viewer application
 
 BUILD_DEPENDS=	eog:${PORTSDIR}/graphics/eog
-LIB_DEPENDS=	gdata.7:${PORTSDIR}/devel/libgdata06
+LIB_DEPENDS=	gdata:${PORTSDIR}/devel/libgdata06
 RUN_DEPENDS=	eog:${PORTSDIR}/graphics/eog
 
 CONFLICTS=	eog-plugins-3.[0-9]*
@@ -28,8 +28,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gtk20
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 36929106f..d5de8992e 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/graphics/eog/Makefile,v 1.126 2011/04/30 20:43:17 mezz Exp $
+#   $MCom: ports/graphics/eog/Makefile,v 1.127 2011/06/03 21:27:50 mezz Exp $
 #
 
 PORTNAME=	eog
@@ -32,8 +32,8 @@ INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	eog.schemas
 
diff --git a/graphics/evince/Makefile b/graphics/evince/Makefile
index 82accf93a..71cee1542 100644
--- a/graphics/evince/Makefile
+++ b/graphics/evince/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/graphics/evince/Makefile,v 1.156 2012/06/13 07:58:41 kwm Exp $
+#    $MCom: ports/graphics/evince/Makefile,v 1.157 2012/06/13 12:31:10 kwm Exp $
 #
 
 PORTNAME=	evince
 PORTVERSION=	2.32.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics print gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index 724915f69..70d7b8eac 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -3,7 +3,7 @@
 # Whom:                Pawel Worach <pawel.worach@gmail.com>
 #
 # $FreeBSD$
-#   $MCom: ports/lang/gjs/Makefile,v 1.23 2012/01/22 10:58:32 kwm Exp $
+#   $MCom: ports/lang/gjs/Makefile,v 1.24 2012/05/25 15:36:00 kwm Exp $
 #
 
 PORTNAME=	gjs
@@ -23,9 +23,10 @@ LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
 USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_PYTHON=	build
+USE_PYTHON_BUILD=yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack glib20 ltverhack
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index daabedf76..13437c875 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/math/gcalctool/Makefile,v 1.142 2011/04/22 16:21:02 mezz Exp $
+#   $MCom: ports/math/gcalctool/Makefile,v 1.143 2011/04/30 20:43:21 mezz Exp $
 #
 
 PORTNAME=	gcalctool
@@ -24,8 +24,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 gnomedocutils gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gcalctool.1
 GLIB_SCHEMAS=	org.gnome.gcalctool.gschema.xml
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index adaebeee4..d4a12132f 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,7 +3,7 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
-#   $MCom: ports/multimedia/totem/Makefile,v 1.158 2011/10/23 20:59:27 kwm Exp $
+#   $MCom: ports/multimedia/totem/Makefile,v 1.159 2012/03/18 22:58:27 kwm Exp $
 #
 
 PORTNAME=	totem
@@ -38,8 +38,8 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	LIBS="-lXrandr" \
 		BROWSER_PLUGIN_DIR="${WEBPLUGINS_DIR}"
 CONFIGURE_ARGS=	--with-plugins="${TOTEM_PLUGINS}"
diff --git a/net-im/empathy/Makefile b/net-im/empathy/Makefile
index e0871e2ed..dce98318e 100644
--- a/net-im/empathy/Makefile
+++ b/net-im/empathy/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/empathy/Makefile,v 1.88 2011/11/12 14:54:37 kwm Exp $
+#    $MCom: ports/net-im/empathy/Makefile,v 1.89 2011/12/06 14:17:10 kwm Exp $
 
 PORTNAME=	empathy
 PORTVERSION=	2.34.0
@@ -44,8 +44,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PYTHON=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-Werror \
 		--with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt
 
diff --git a/net-im/folks/Makefile b/net-im/folks/Makefile
index 8d79c543c..099541e68 100644
--- a/net-im/folks/Makefile
+++ b/net-im/folks/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/folks/Makefile,v 1.27 2012/02/27 23:21:47 kwm Exp $
+#   $MCom: ports/net-im/folks/Makefile,v 1.28 2012/06/03 03:07:03 mezz Exp $
 #
 
 PORTNAME=	folks
@@ -28,8 +28,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomehier gnomehack intlhack ltverhack evolutiondataserver3
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	LIBVER=25 VERSION=33
 
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index fbacf50df..1f0df9e51 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -29,7 +29,7 @@ USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack pkgconfig glib20 ltverhack
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 7887ee0de..3ecdfed19 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-idle/Makefile,v 1.4 2011/05/28 13:33:32 kwm Exp $
+#    $MCom: ports/net-im/telepathy-idle/Makefile,v 1.5 2011/11/22 11:12:58 kwm Exp $
 #
 
 PORTNAME=	telepathy-idle
@@ -31,7 +31,8 @@ USE_GNOME=	gnomehack pkgconfig glib20
 
 MAN8=		telepathy-idle.8
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.pre.mk>
 
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 215200757..1d22fadfd 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-logger/Makefile,v 1.12 2012/06/12 22:59:55 mezz Exp $
+#    $MCom: ports/net-im/telepathy-logger/Makefile,v 1.13 2012/08/08 16:56:40 kwm Exp $
 
 PORTNAME=	telepathy-logger
 PORTVERSION=	0.4.0
@@ -13,10 +13,8 @@ MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Logger utility library for the Telepathy framework
 
-BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
-		g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
 		telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
 
 LICENSE=	LGPL21
@@ -26,8 +24,10 @@ USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig glib20 intltool gnomedocutils ltverhack
-USE_SQLITE=	build
+USE_GNOME=	gnomehack glib20 intltool gnomedocutils ltverhack libxml2 \
+		libxslt:build
+USE_PKGCONFIG=	build
+USE_SQLITE=	yes
 USE_PYTHON_BUILD=	yes
 GLIB_SCHEMAS=	org.freedesktop.Telepathy.Logger.gschema.xml
 
diff --git a/net-im/telepathy-mission-control/Makefile b/net-im/telepathy-mission-control/Makefile
index f8053b46c..48311273c 100644
--- a/net-im/telepathy-mission-control/Makefile
+++ b/net-im/telepathy-mission-control/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.21 2011/11/22 11:32:37 kwm Exp $
+#    $MCom: ports/net-im/telepathy-mission-control/Makefile,v 1.22 2012/06/12 22:55:59 mezz Exp $
 
 PORTNAME=	telepathy-mission-control
 PORTVERSION=	5.12.0
@@ -18,8 +18,8 @@ LIB_DEPENDS=	telepathy.2:${PORTSDIR}/net-im/libtelepathy \
 
 USE_GNOME=	gnomeprefix pkgconfig gconf2 libxslt gnomehack ltverhack
 USE_AUTOTOOLS=	libtool
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 GLIB_SCHEMAS=	im.telepathy.MissionControl.FromEmpathy.gschema.xml
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index 6adc42321..f3fae8840 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net-im/telepathy-salut/Makefile,v 1.7 2012/04/20 21:04:15 kwm Exp $
+#   $MCom: ports/net-im/telepathy-salut/Makefile,v 1.8 2012/06/12 23:14:58 mezz Exp $
 #
 
 PORTNAME=	telepathy-salut
@@ -21,13 +21,14 @@ LIB_DEPENDS=	avahi-glib.1:${PORTSDIR}/net/avahi-app \
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig glib20
+USE_GNOME=	gnomehack glib20
+USE_PKGCONFIG=	build
 USE_OPENSSL=	yes
 USE_PYTHON_BUILD=	yes
 USE_SQLITE=	3
-CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--disable-Werror --enable-avahi-tests=no
 CPPFLAGS+=	${PTHREAD_CFLAGS}
+LDFLAGS+=	${PTHREAD_LIBS}
 
 MAN8=		telepathy-salut.8
 
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 48e359d5f..29ad92db1 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -3,7 +3,7 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/avahi-app/Makefile,v 1.22 2012/01/15 15:56:09 ahze Exp $
+#   $MCom: ports/net/avahi-app/Makefile,v 1.23 2012/07/09 18:22:18 kwm Exp $
 #
 
 PORTNAME=	avahi
@@ -39,10 +39,9 @@ CONFIGURE_ARGS?=--with-distro=freebsd \
 		--disable-doxygen-dot \
 		--localstatedir=/var \
 		--enable-compat-howl
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_KQUEUE" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
+CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_KQUEUE
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if ${AVAHI_SLAVE}=="no"
 CONFLICTS=	howl-[0-9]*
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index e7e18d32c..6690c3899 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ekiga
 PORTVERSION=	2.0.11
-PORTREVISION=	10
+PORTREVISION=	13
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
@@ -29,9 +29,9 @@ INSTALLS_OMF=	yes
 USE_GNOME=	libgnomeui gnomeprefix gnomehack gnomedocutils \
 		evolutiondataserver intlhack
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
-		SDL_CONFIG="${SDL_CONFIG}"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 CONFIGURE_ARGS=	--with-pwlib-dir=${LOCALBASE} \
 		--with-opal-dir=${LOCALBASE}
 MAKE_JOBS_SAFE=	yes
diff --git a/net/ekiga3/Makefile b/net/ekiga3/Makefile
index 6a00dbf8b..b4ba8d382 100644
--- a/net/ekiga3/Makefile
+++ b/net/ekiga3/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	ekiga3
 PORTVERSION=	3.2.6
-PORTREVISION=	6
+PORTREVISION=	8
 CATEGORIES=	net
 MASTER_SITES=	http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/
 DISTNAME=	ekiga-${PORTVERSION}
 
-MAINTAINER=	melifaro@ipfw.ru
+MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VoIP and video conferencing application
 
 LIB_DEPENDS=	sigc-2:${PORTSDIR}/devel/libsigc++20 \
@@ -56,7 +56,7 @@ OPTIONS=	LDAP		"Enable LDAP support" off \
 BROKEN=		Please set WITH_DBUS or remove WITH_KDE4!
 .	endif
 USE_KDE4=		kdehier kdelibs
-USE_QT_VER=		4
+USE_QT4=		# empty
 CONFIGURE_ARGS+=	--enable-kde
 .else
 CONFIGURE_ARGS+=	--disable-kde
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 294bfa5b9..e5e2f53d7 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/glib-networking/Makefile,v 1.17 2012/01/05 20:14:35 kwm Exp $
+#   $MCom: ports/net/glib-networking/Makefile,v 1.18 2012/05/15 21:00:44 kwm Exp $
 #
 
 PORTNAME=	glib-networking
@@ -31,8 +31,8 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
-CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 post-patch:
 	@${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 7813e0597..41b994181 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom$
+#   $MCom: ports/net/gnome-nettool/Makefile,v 1.60 2011/05/01 23:42:25 mezz Exp $
 #
 
 PORTNAME=	gnome-nettool
 PORTVERSION=	2.32.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
@@ -27,8 +28,8 @@ USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-DHAVE_SOCKADDR_SA_LEN
 
 post-install:
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 3fd0b1f39..4afc463df 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtk-vnc
 PORTVERSION=	0.3.10
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
@@ -27,8 +27,8 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-gtkglext=yes
 
 .include <bsd.port.mk>
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 265ddbbe5..f312c5c54 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/libgweather/Makefile,v 1.44 2011/04/10 15:36:08 mezz Exp $
+#   $MCom: ports/net/libgweather/Makefile,v 1.45 2011/04/30 20:43:23 mezz Exp $
 #
 
 PORTNAME=	libgweather
 PORTVERSION=	2.30.3
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
@@ -26,8 +27,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	gweather.schemas
 
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index ca71f562a..1921e36ea 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vinagre/Makefile,v 1.45 2011/04/30 20:43:23 mezz Exp $
+#   $MCom: ports/net/vinagre/Makefile,v 1.46 2011/09/17 16:26:44 kwm Exp $
 #
 
 PORTNAME=	vinagre
 PORTVERSION=	2.30.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -33,8 +33,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--enable-avahi --enable-applet -enable-ssh
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	vinagre.schemas
 
diff --git a/net/vino/Makefile b/net/vino/Makefile
index a5c4b0573..850065024 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vino/Makefile,v 1.86 2011/05/02 21:09:12 kwm Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.87 2011/06/06 17:54:24 kwm Exp $
 #
 
 PORTNAME=	vino
 PORTVERSION=	2.32.2
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -29,8 +29,8 @@ USE_XORG=	xtst
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	vino-server.schemas
 
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index bf7df47b3..96dc81f57 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Anders F Bjorklund <afb@users.sourceforge.net>
 #
 # $FreeBSD$
-#   $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.31 2011/12/13 18:56:16 kwm Exp $
+#   $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.32 2012/08/08 16:56:40 kwm Exp $
 
 PORTNAME=	PackageKit
 PORTVERSION=	0.6.21
@@ -28,6 +28,7 @@ USE_GMAKE=	yes
 USE_XZ=		yes
 USE_GETTEXT=	yes
 USE_GNOME=	glib20 intltool
+USE_QT4=	#empty
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_SQLITE=	yes
@@ -90,9 +91,8 @@ LIB_DEPENDS+=	packagekit-glib2.14:${PORTSDIR}/ports-mgmt/packagekit
 .if ${SLAVEPORT}=="qt4"
 CONFIGURE_ARGS+=--enable-qt
 LIB_DEPENDS+=	cppunit-1.12.1:${PORTSDIR}/devel/cppunit
-USE_QT_VER+=	4
-QT_COMPONENTS+=	dbus gui xml sql moc_build
-.include "${PORTSDIR}/Mk/bsd.qt.mk"
+USE_QT4+=	dbus gui xml sql moc_build
+#.include "${PORTSDIR}/Mk/bsd.qt.mk"
 .endif
 .else
 CONFIGURE_ARGS+=--disable-qt
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
index bfeb270c0..9efa7fd9e 100644
--- a/security/gnome-keyring/Makefile
+++ b/security/gnome-keyring/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring/Makefile,v 1.102 2011/04/09 17:20:19 mezz Exp $
+#   $MCom: ports/security/gnome-keyring/Makefile,v 1.103 2012/08/04 09:42:52 kwm Exp $
 #
 
 PORTNAME=	gnome-keyring
@@ -30,8 +30,8 @@ USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
 		--with-root-certs="${LOCALBASE}/share/certs/ca-root-nss.crt"
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.gnome.crypto.cache.gschema.xml \
 		org.gnome.crypto.pgp.gschema.xml
 
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 44e9c3817..f124a47de 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Dave McKay <dave@mu.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/seahorse/Makefile,v 1.104 2011/07/03 11:57:45 kwm Exp $
+#   $MCom: ports/security/seahorse/Makefile,v 1.107 2011/09/18 11:50:10 kwm Exp $
 #
 
 PORTNAME=	seahorse
 PORTVERSION=	2.32.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -35,8 +35,8 @@ USE_GNOME=	gnomehack intlhack gnomeprefix gconf2 gnomedocutils
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--enable-introspection=no
 
 GCONF_SCHEMAS=	seahorse.schemas
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index a8130d6b2..85a1272f1 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/brasero/Makefile,v 1.88 2011/05/29 05:20:56 marcus Exp $
+#    $MCom: ports/sysutils/brasero/Makefile,v 1.89 2011/08/24 10:40:41 kwm Exp $
 
 PORTNAME=	brasero
 PORTVERSION=	2.32.1
-PORTREVISION=	2
+PORTREVISION=	5
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -36,8 +36,8 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--disable-inotify --with-html-dir=${PREFIX}/share/doc \
 		--enable-gtk3=no --enable-introspection=yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include -DHAVE_CAM_LIB_H=1
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		brasero.1
 GLIB_SCHEMAS=	org.gnome.brasero.gschema.xml
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index ac5f1f030..f0b4dd767 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/consolekit/Makefile,v 1.28 2011/04/30 20:43:25 mezz Exp $
+#    $MCom: ports/sysutils/consolekit/Makefile,v 1.29 2011/08/07 13:20:13 kwm Exp $
 
 PORTNAME=	consolekit
 PORTVERSION=	0.4.5
@@ -25,8 +25,8 @@ USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pid-file=/var/run/${PORTNAME}.pid \
 		--localstatedir=/var
 
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 80cfcbfcd..a82e82f6f 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.87 2011/04/25 19:45:50 mezz Exp $
+#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.88 2011/04/30 20:43:25 mezz Exp $
 #
 
 PORTNAME=	gconf-editor
 PORTVERSION=	2.32.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
@@ -25,8 +26,8 @@ INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui gnomedocutils
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		gconf-editor.1
 GCONF_SCHEMAS=	gconf-editor.schemas
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 06cebf91b..fdb58759f 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.217 2011/04/30 20:43:26 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.218 2011/06/03 21:27:50 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	2.32.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -37,8 +38,8 @@ GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	control-center.schemas fontilus.schemas \
 		gnome-control-center.schemas
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index aef40eafa..3daad3951 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.143 2011/04/25 19:59:37 mezz Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.144 2011/04/30 20:43:26 mezz Exp $
 #
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.28.2
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -29,8 +30,8 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
 		librsvg2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lutil"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lutil
 
 GCONF_SCHEMAS=	gnome-system-monitor.schemas
 
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 3258b30fb..a372ca6b8 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast<kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/polkit/Makefile,v 1.18 2012/05/17 08:15:40 kwm Exp $
+#   $MCom: ports/sysutils/polkit/Makefile,v 1.19 2012/08/04 21:04:25 kwm Exp $
 #
 
 PORTNAME=	polkit
@@ -25,6 +25,7 @@ USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-authfw=pam \
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 7e533cc53..9f48df195 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.60 2010/04/01 22:21:53 kwm Exp $
+#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.62 2011/04/04 09:06:08 kwm Exp $
 #
 
 PORTNAME=	system-tools-backends
@@ -28,8 +28,8 @@ GNU_CONFIGURE=	yes
 USE_GNOME_SUBR=	yes
 CONFIGURE_ARGS=	--with-stb-group=wheel \
 		--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|@GETTEXT_PACKAGE@|system-tools-backends|g' \
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 4715ea17c..83cb19604 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/zeitgeist/Makefile,v 1.4 2011/10/17 10:22:12 kwm Exp $
+#    $MCom: ports/sysutils/zeitgeist/Makefile,v 1.5 2012/02/10 10:53:16 kwm Exp $
 #
 
 PORTNAME=	zeitgeist
@@ -27,8 +27,8 @@ USE_PYTHON=	yes
 FETCH_ARGS=	-Fpr
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=	zeitgeist-daemon.1
 
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index bf11d5f25..b369dfd1a 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.136 2011/04/30 20:43:27 mezz Exp $
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.137 2012/02/14 19:34:00 kwm Exp $
 #
 
 PORTNAME=	epiphany-extensions
 PORTVERSION=	2.30.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -29,8 +29,8 @@ USE_GNOME=	gnomeprefix gnomehack intlhack
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 EPHY_EXTENSIONS=really-all
 EPHY_VERSION=	${PORTVERSION:R}
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 356850665..ebf57767a 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/www/gtkhtml3/Makefile,v 1.182 2011/10/24 08:17:47 kwm Exp $
+#   $MCom: ports/www/gtkhtml3/Makefile,v 1.183 2012/03/13 01:34:32 mezz Exp $
 #
 
 PORTNAME=	gtkhtml3
 PORTVERSION=	3.32.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/www/webkit-gtk2/files/patch-configure b/www/webkit-gtk2/files/patch-configure
index 6cb7fa58b..dd277a8cc 100644
--- a/www/webkit-gtk2/files/patch-configure
+++ b/www/webkit-gtk2/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	2012-08-04 12:19:43.000000000 +0200
 +++ configure	2012-08-04 13:15:32.000000000 +0200
-@@ -17704,7 +17704,7 @@
- fi
- case $host in
- i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
--|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
-+|amd64-*-freebsd*|i?86-*-freebsd*|amd64-*-freebsd*|ia64-*-freebsd*)
-     pic_options='-fPIC'
-     ;;
- i?86-apple-darwin*)
 @@ -19144,8 +19144,8 @@
  .SECONDARY: $(gsettings_SCHEMAS)
  
diff --git a/www/webkit-gtk3/files/patch-configure b/www/webkit-gtk3/files/patch-configure
index 60b18be03..8466810cd 100644
--- a/www/webkit-gtk3/files/patch-configure
+++ b/www/webkit-gtk3/files/patch-configure
@@ -1,14 +1,5 @@
 --- configure.orig	2012-05-16 12:57:04.000000000 +0200
 +++ configure	2012-05-16 14:00:03.000000000 +0200
-@@ -17704,7 +17704,7 @@
- fi
- case $host in
- i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux* \
--|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*)
-+|amd64-*-freebsd*|i?86-*-freebsd*|amd64-*-freebsd*|ia64-*-freebsd*)
-     pic_options='-fPIC'
-     ;;
- i?86-apple-darwin*)
 @@ -19144,8 +19144,8 @@
  .SECONDARY: $(gsettings_SCHEMAS)
  
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index bbf9b7b13..f6056c410 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.185 2011/04/10 21:44:14 mezz Exp $
+#   $MCom: ports/x11-themes/gnome-themes/Makefile,v 1.186 2011/04/30 20:43:32 mezz Exp $
 #
 
 PORTNAME=	gnome-themes
@@ -27,7 +27,7 @@ USE_AUTOTOOLS=	libtool
 INSTALLS_ICONS=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix intlhack metacity gtk20
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 .include <bsd.port.mk>
author	kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>	2012-08-18 03:06:48 +0800
committer	kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>	2012-08-18 03:06:48 +0800
commit	e1fad6b7b570f2f5685fb302a460b50679e04ae8 (patch)
tree	6bdaaaa51925e10719a04696aa74e5d389db0195
parent	d6f2b76b19d2ae10403b675e549d5d5a8279079d (diff)
download	marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.gz marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.bz2 marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.lz marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.xz marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.tar.zst marcuscom-ports-e1fad6b7b570f2f5685fb302a460b50679e04ae8.zip