Sync w/ FreeBSD ports tree that I have committed since a few days.

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

16 files changed, 114 insertions, 89 deletions

diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 24373743c..2a336ac26 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	fileroller
-# Date created:				18 May 2002
-# Whom:					Anders Nordby <anders@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/archivers/file-roller/Makefile,v 1.189 2012/08/17 19:06:42 kwm Exp $
-#
+# Created by: Anders Nordby <anders@FreeBSD.org>
+# $FreeBSD: head/archivers/file-roller/Makefile 309632 2012-12-29 20:57:20Z mezz $
+#   $MCom: ports/archivers/file-roller/Makefile,v 1.184 2010/11/15 22:58:48 kwm Exp $
 
 PORTNAME=	file-roller
 PORTVERSION=	2.32.1
@@ -39,16 +35,19 @@ CONFIGURE_ARGS=	--disable-packagekit
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GCONF_SCHEMAS=	file-roller.schemas
 
-OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
+OPTIONS_DEFINE=	DOCS NAUTILUS
+NAUTILUS_DESC=	Enable Nautilus extension
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFAULT=NAUTILUS
 
-.if !defined(WITHOUT_NAUTILUS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNAUTILUS}
 USE_GNOME+=	nautilus2
 PLIST_SUB+=	NAUTILUS=""
 .else
 PLIST_SUB+=	NAUTILUS="@comment "
-CONFIGURE_ARGS+=	--disable-nautilus-actions
+CONFIGURE_ARGS+=--disable-nautilus-actions
 .endif
 
 post-patch:
@@ -58,11 +57,11 @@ post-patch:
 
 post-install:
 	@-update-desktop-database
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/file-roller3/Makefile b/archivers/file-roller3/Makefile
index a62dc9d9f..910b55461 100644
--- a/archivers/file-roller3/Makefile
+++ b/archivers/file-roller3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	fileroller
-# Date created:				18 May 2002
-# Whom:					Anders Nordby <anders@FreeBSD.org>
-#
+# Created by: Anders Nordby <anders@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/archivers/file-roller3/Makefile,v 1.19 2011/11/19 10:18:05 kwm Exp $
-#
+#   $MCom$
 
 PORTNAME=	file-roller
 PORTVERSION=	3.4.2
@@ -30,23 +26,26 @@ USE_GNOME=	gnomeprefix intlhack gnomehack desktopfileutils gnomedocutils \
 		gtk30 gconf2
 USE_XORG=	sm
 GNU_CONFIGURE=	yes
-CPPFLAGS=	-I${LOCALBASE}/include
-LDFLAGS=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-packagekit
 
 PORTDOCS=	AUTHORS NEWS README TODO ChangeLog
 GLIB_SCHEMAS=	org.gnome.FileRoller.gschema.xml
 
-OPTIONS=	NAUTILUS	"Enable Nautilus extension"	on
+OPTIONS_DEFINE=	DOCS NAUTILUS
+NAUTILUS_DESC=	Enable Nautilus extension
+
+OPTIONS_DEFAULT=NAUTILUS
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NAUTILUS)
+.if ${PORT_OPTIONS:MNAUTILUS}
 USE_GNOME+=	nautilus3
 PLIST_SUB+=	NAUTILUS=""
 .else
 PLIST_SUB+=	NAUTILUS="@comment "
-CONFIGURE_ARGS+=	--disable-nautilus-actions
+CONFIGURE_ARGS+=--disable-nautilus-actions
 .endif
 
 post-patch:
@@ -56,7 +55,7 @@ post-patch:
 
 post-install:
 	@-update-desktop-database
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
diff --git a/archivers/file-roller3/files/patch-src_fr-command-zip.c b/archivers/file-roller3/files/patch-src_fr-command-zip.c
index 29525d9e1..5995813eb 100644
--- a/archivers/file-roller3/files/patch-src_fr-command-zip.c
+++ b/archivers/file-roller3/files/patch-src_fr-command-zip.c
@@ -5,7 +5,7 @@
  	fr_process_set_out_line_func (comm->process, list__process_line, comm);
  
 +#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "/usr/local/bin/unzip");
++	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
 +#else
  	fr_process_begin_command (comm->process, "unzip");
 +#endif
@@ -17,7 +17,7 @@
  				      comm);
  
 +#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "/usr/local/bin/unzip");
++	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
 +#else
  	fr_process_begin_command (comm->process, "unzip");
 +#endif
@@ -29,7 +29,7 @@
  fr_command_zip_test (FrCommand   *comm)
  {
 +#ifdef __FreeBSD__
-+	fr_process_begin_command (comm->process, "/usr/local/bin/unzip");
++	fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip");
 +#else
  	fr_process_begin_command (comm->process, "unzip");
 +#endif
diff --git a/archivers/file-roller3/pkg-descr b/archivers/file-roller3/pkg-descr
index 703a89829..75feec94b 100644
--- a/archivers/file-roller3/pkg-descr
+++ b/archivers/file-roller3/pkg-descr
@@ -17,5 +17,3 @@ of any type for which you have a viewer.
 Former WinZip users may find this program useful.  It serves the same purpose.
 
 WWW: http://fileroller.sourceforge.net/
-
-- Anders Nordby <anders@FreeBSD.org>
diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile
index 8ab7b4297..9b7ae302b 100644
--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	libcanberra
-# Date created:				05 August 2008
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
-# $FreeBSD$
-#   $MCom: ports/audio/libcanberra/Makefile,v 1.29 2012/04/27 13:28:44 kwm Exp $
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
+# $FreeBSD: head/audio/libcanberra/Makefile 309632 2012-12-29 20:57:20Z mezz $
+#   $MCom: ports/audio/libcanberra/Makefile,v 1.28 2011/06/11 18:55:56 mezz Exp $
 
 PORTNAME=	libcanberra
 PORTVERSION=	0.28
@@ -14,10 +11,11 @@ MASTER_SITES=	http://0pointer.de/lennart/projects/libcanberra/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Implementation of the Freedesktop sound theme spec
 
-LIB_DEPENDS=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
-
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LGPL
+
+LIB_DEPENDS=	vorbisfile:${PORTSDIR}/audio/libvorbis
+
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier gtk20 ltverhack gconf2
 USE_LDCONFIG=	yes
@@ -28,31 +26,30 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 .if !defined(SLAVEPORT)
 GCONF_SCHEMAS=	libcanberra.schemas
-
-OPTIONS=	PULSE "Enable Pulse Audio support" off \
-		GSTREAMER "Enable GStreamer audio support" off
+.else
+OPTIONS_DEFINE=	PULSEAUDIO GSTREAMER
 .endif
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if defined(SLAVEPORT)
 USE_GNOME+=	gtk30
-LIB_DEPENDS+=	canberra.0:${PORTSDIR}/audio/libcanberra
+LIB_DEPENDS+=	canberra:${PORTSDIR}/audio/libcanberra
 CONFIGURE_ARGS+=--enable-gtk3
 .else
 CONFIGURE_ARGS+=--disable-gtk3
 
-.if !defined(WITHOUT_PULSE)
-LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+LIB_DEPENDS+=	pulse:${PORTSDIR}/audio/pulseaudio
 PLIST_SUB+=	PULSE=""
 .else
 CONFIGURE_ARGS+=--disable-pulse
 PLIST_SUB+=	PULSE="@comment "
 .endif
 
-.if !defined(WITHOUT_GSTREAMER)
+.if ${PORT_OPTIONS:MGSTREAMER}
 USE_GSTREAMER=	yes
 PLIST_SUB+=	GSTREAMER=""
 .else
@@ -66,4 +63,4 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
 	    	${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 431b4090d..6a5e61ab9 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.214 2012/08/08 16:56:39 kwm Exp $
+#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.215 2012/09/01 23:02:08 mezz Exp $
 #
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	2.32.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -19,7 +19,7 @@ COMMENT=	The data backends for the Evolution integrated mail/PIM suite
 LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		gdata.7:${PORTSDIR}/devel/libgdata06 \
 		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		ical.44:${PORTSDIR}/devel/libical \
+		ical:${PORTSDIR}/devel/libical \
 		nss3.1:${PORTSDIR}/security/nss \
 		tasn1.4:${PORTSDIR}/security/libtasn1 \
 		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index 527384093..8eef3904d 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig	2009-12-25 20:21:00.000000000 +0100
-+++ configure	2009-12-25 20:21:01.000000000 +0100
-@@ -15968,6 +15968,14 @@
- _ACEOF
+--- configure.orig	2010-11-14 22:59:14.000000000 -0800
++++ configure	2012-06-12 08:40:11.000000000 -0700
+@@ -14174,6 +14174,14 @@
+ $as_echo "#define _WIN32_WINNT 0x501" >>confdefs.h
  
  	;;
 +*freebsd*)
@@ -13,5 +13,29 @@
 +	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
 +	;;
  *)
- 	os_win32=no
+ 	os_win32='no'
  	NO_UNDEFINED=''
+@@ -16195,9 +16203,8 @@
+ fi
+ 
+ 
+-	ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "	#if HAVE_ET_COM_ERR_H
+-			#include <com_err.h>
+-			#endif
++	ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "	#include <stdio.h>
++			#include <stdarg.h>
+ 
+ "
+ if test "x$ac_cv_header_et_com_err_h" = x""yes; then :
+@@ -16207,9 +16214,8 @@
+ fi
+ 
+ 
+-	ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "	#if HAVE_COM_ERR_H
+-			#include <com_err.h>
+-			#endif
++	ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "	#include <stdio.h>
++			#include <stdarg.h>
+ 
+ "
+ if test "x$ac_cv_header_com_err_h" = x""yes; then :
diff --git a/databases/evolution-data-server3/Makefile b/databases/evolution-data-server3/Makefile
index 4f7fc791c..832c12d63 100644
--- a/databases/evolution-data-server3/Makefile
+++ b/databases/evolution-data-server3/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server3/Makefile,v 1.27 2012/08/08 16:56:39 kwm Exp $
+#   $MCom: ports/databases/evolution-data-server3/Makefile,v 1.28 2012/08/16 19:28:53 kwm Exp $
 #
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	3.4.4
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -23,7 +24,7 @@ LIB_DEPENDS=	soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
 		oauth.8:${PORTSDIR}/net/liboauth \
 		goa-1.0.0:${PORTSDIR}/net/gnome-online-accounts \
 		gdata.13:${PORTSDIR}/devel/libgdata \
-		ical.44:${PORTSDIR}/devel/libical \
+		ical:${PORTSDIR}/devel/libical \
 		nss3.1:${PORTSDIR}/security/nss \
 		tasn1.4:${PORTSDIR}/security/libtasn1 \
 		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index d825cef49..444708940 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -1,6 +1,6 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.84 2012/08/22 14:44:37 kwm Exp $
+#   $MCom: ports/devel/gvfs/Makefile,v 1.85 2012/12/14 16:09:28 kwm Exp $
 
 PORTNAME=	gvfs
 PORTVERSION=	1.12.3
@@ -24,7 +24,8 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-obexftp
+CONFIGURE_ARGS=	--disable-obexftp \
+		--disable-afc
 
 OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
 OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 11a2e7abf..4ed0994c1 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	py-gobject
-# Date created:				10 January 2006
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.56 2011/10/07 13:30:13 kwm Exp $
-#
+#   $MCom$
 
 PORTNAME=	gobject
 PORTVERSION=	2.28.6
@@ -20,6 +16,7 @@ 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
@@ -30,15 +27,21 @@ USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 USE_PYTHON=	2.5+
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-docs --disable-introspection
 
-CONFLICTS=	py*-gtk-0* 
+CONFLICTS=	py*-gtk-0*
 PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
 
-.if exists(${LOCALBASE}/lib/libffi.so)
-LIB_DEPENDS+=	ffi.5:${PORTSDIR}/devel/libffi
+OPTIONS_DEFINE=	LIBFFI
+LIBFFI_DESC=	Enable libffi support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLIBFFI}
+LIB_DEPENDS+=	ffi:${PORTSDIR}/devel/libffi
 CONFIGURE_ARGS+=--with-ffi
 .else
 CONFIGURE_ARGS+=--without-ffi
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index 30b42c982..771874406 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -1,9 +1,9 @@
 bin/pygobject-codegen-2.0
 include/pygtk-2.0/pyglib.h
 include/pygtk-2.0/pygobject.h
-lib/libpyglib-2.0-python2.7.la
-lib/libpyglib-2.0-python2.7.so
-lib/libpyglib-2.0-python2.7.so.0
+lib/libpyglib-2.0-python%%PYTHON_VER%%.la
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so
+lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/glib/__init__.py
 %%PYTHON_SITELIBDIR%%/glib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glib/__init__.pyo
diff --git a/devel/py-gobject3/Makefile b/devel/py-gobject3/Makefile
index c81b5970e..1e460e912 100644
--- a/devel/py-gobject3/Makefile
+++ b/devel/py-gobject3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	py-gobject
-# Date created:				10 January 2006
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject3/Makefile,v 1.9 2012/05/01 11:41:22 kwm Exp $
-#
+#   $MCom$
 
 PORTNAME=	gobject
 PORTVERSION=	3.2.2
@@ -19,6 +15,7 @@ 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
@@ -30,6 +27,7 @@ USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack glib20
 USE_PYTHON=	2.5+
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -38,8 +36,13 @@ CONFLICTS=	py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \
 		py*-gobject-2.*.6_1
 PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
 
-.if exists(${LOCALBASE}/lib/libffi.so)
-LIB_DEPENDS+=	ffi.5:${PORTSDIR}/devel/libffi
+OPTIONS_DEFINE=	LIBFFI
+LIBFFI_DESC=	Enable libffi support
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MLIBFFI}
+LIB_DEPENDS+=	ffi:${PORTSDIR}/devel/libffi
 CONFIGURE_ARGS+=--with-ffi
 .else
 CONFIGURE_ARGS+=--without-ffi
diff --git a/devel/py-gobject3/pkg-plist b/devel/py-gobject3/pkg-plist
index 8ccd8110c..5f1351539 100644
--- a/devel/py-gobject3/pkg-plist
+++ b/devel/py-gobject3/pkg-plist
@@ -1,7 +1,7 @@
 include/pygobject-3.0/pygobject.h
-lib/libpyglib-gi-2.0-python2.7.la
-lib/libpyglib-gi-2.0-python2.7.so
-lib/libpyglib-gi-2.0-python2.7.so.0
+lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.la
+lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so
+lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gi/__init__.py
 %%PYTHON_SITELIBDIR%%/gi/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gi/__init__.pyo
diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile
index e3d7b47a9..1192651ab 100644
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@@ -11,8 +11,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A graph based image processing framework
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	babl-0:${PORTSDIR}/x11/babl \
-    		execinfo:${PORTSDIR}/devel/libexecinfo
+LIB_DEPENDS=	babl-0.1:${PORTSDIR}/x11/babl
 
 OPTIONS_DEFINE=	CAIRO DOCS ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER JPEG \
 		LUA OPENEXR OPENRAW SIMD PANGO PNG LIBRSVG2 SDL SPIRO V4L
@@ -29,9 +28,10 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	${PREFIX}/lib/gegl-0.2
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV+=	ac_cv_header_execinfo_h=no
 CONFIGURE_ARGS+=--without-vala
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo -lintl
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
 GEGL_MINOR=	199
 GEGL_VER=	0.2
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 96dc81f57..154865865 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.32 2012/08/08 16:56:40 kwm Exp $
+#   $MCom: ports/ports-mgmt/packagekit/Makefile,v 1.33 2012/08/17 19:06:46 kwm Exp $
 
 PORTNAME=	PackageKit
 PORTVERSION=	0.6.21
@@ -67,7 +67,7 @@ MAN1=	pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_PORTS)
-RUN_DEPENDS+=	portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
+RUN_DEPENDS+=	${LOCALBASE}/sbin/portupgrade:${PORTSDIR}/ports-mgmt/portupgrade
 USE_RUBY=	yes
 CONFIGURE_ARGS+=--enable-ports --with-default-backend=ports
 PLIST_SUB+=	PORTS=""
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index c7abf743d..d6b0c96e9 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -3,7 +3,7 @@
 # Whom:					Franz Klammer <klammer@webonaut.com>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/zenity/Makefile,v 1.116 2011/10/07 14:41:14 kwm Exp $
+#   $MCom: ports/x11/zenity/Makefile,v 1.117 2012/06/14 04:31:00 mezz Exp $
 #
 
 PORTNAME=	zenity
@@ -25,7 +25,7 @@ USE_XZ=		yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 CONFIGURE_ENV=	LIBS="${PTHREAD_LIBS}"
 
 MAN1=		zenity.1