* Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4 which

  are the latest stable releases.
* Update vala to the newest stable release 0.18.1, also update a few ports
  in the gtk/gnome stack.
* The c++ bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles.
* Remove pkg-config run depends from glib20 and freetype2. This doesn't
  eliminate pkg-config run dependency completely, a second phase is needed
  and is planned.
* Support for .:run. and .:build. for USE_GNOME components was added.
  Currently only libxml2 and libxslt support this mechanism.
* Updates of the telepathy stack and empathy.
* Trim makefile headers, convert ports to new options, trim off library
  versions for some ports.
* Fix other ports so they build with the new glib version.

Thanks to miwi and crees for helping out with some exp-runs.
Approved by:	portmgr (miwi & bapt)
Obtained from:	gnome team repo

22 files changed, 157 insertions, 64 deletions

diff --git a/sysutils/fusefs-cryptofs/Makefile b/sysutils/fusefs-cryptofs/Makefile
index 1191bfe6e1e9..294aa4f5f584 100644
--- a/sysutils/fusefs-cryptofs/Makefile
+++ b/sysutils/fusefs-cryptofs/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
 USES=		fuse
 
 PLIST_FILES=	bin/cryptofs
diff --git a/sysutils/fusefs-sshfs/Makefile b/sysutils/fusefs-sshfs/Makefile
index 1bf3b51af337..16aa6255596a 100644
--- a/sysutils/fusefs-sshfs/Makefile
+++ b/sysutils/fusefs-sshfs/Makefile
@@ -16,6 +16,7 @@ KMODDIR?=	${LOCALBASE}/modules
 GNU_CONFIGURE=	yes
 USES=		fuse
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 
 MAN1=	sshfs.1
 
diff --git a/sysutils/fusefs-wdfs/Makefile b/sysutils/fusefs-wdfs/Makefile
index 05298dfcb539..846480697466 100644
--- a/sysutils/fusefs-wdfs/Makefile
+++ b/sysutils/fusefs-wdfs/Makefile
@@ -16,6 +16,7 @@ LIB_DEPENDS=	neon.27:${PORTSDIR}/www/neon29
 GNU_CONFIGURE=	yes
 USES=		fuse
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 
 PLIST_FILES=	bin/wdfs
 
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 9296e0c53f11..28d090a7f0c9 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:	gnomesystemmonitor
-# Date created:				09 May 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.141 2010/09/29 13:44:33 kwm Exp $
-#
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.147 2012/10/02 15:10:10 kwm Exp $
 
 PORTNAME=	gnome-system-monitor
 PORTVERSION=	2.28.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,6 +17,8 @@ LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
 		gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
+CONFLICTS=	gnome-system-monitor-3.[0-9]*
+
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 INSTALLS_OMF=	yes
@@ -28,9 +26,15 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils \
 		librsvg2
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lutil"
 CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib -lutil
 
 GCONF_SCHEMAS=	gnome-system-monitor.schemas
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|<glib/gtypes.h>|<glib.h>|g' \
+		-e 's|<glib/gmacros.h>|<glib.h>|g' \
+		-e 's|<glib/gstring.h>|<glib.h>|g' \
+		${WRKSRC}/src/*.[ch] ${WRKSRC}/src/*.cpp
+
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-system-monitor/files/patch-src_interface.h b/sysutils/gnome-system-monitor/files/patch-src_interface.h
new file mode 100644
index 000000000000..3e8eea33973d
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_interface.h
@@ -0,0 +1,11 @@
+--- src/interface.h.orig	2012-06-12 22:10:02.000000000 +0200
++++ src/interface.h	2012-06-12 22:10:12.000000000 +0200
+@@ -20,7 +20,7 @@
+ #ifndef _PROCMAN_INTERFACE_H_
+ #define _PROCMAN_INTERFACE_H_
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include "procman.h"
+ 
diff --git a/sysutils/goaccess/Makefile b/sysutils/goaccess/Makefile
index 2152afa09c8f..cd6628728d17 100644
--- a/sysutils/goaccess/Makefile
+++ b/sysutils/goaccess/Makefile
@@ -22,6 +22,7 @@ LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20 \
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/hdup/Makefile b/sysutils/hdup/Makefile
index 712600a2961b..7047e8b8f30a 100644
--- a/sysutils/hdup/Makefile
+++ b/sysutils/hdup/Makefile
@@ -28,6 +28,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	autoconf
 
 MAN1=		hdup.1
diff --git a/sysutils/heartbeat/files/patch-include__clplumbing__c1_uuid.h b/sysutils/heartbeat/files/patch-include__clplumbing__c1_uuid.h
new file mode 100644
index 000000000000..400545b83bba
--- /dev/null
+++ b/sysutils/heartbeat/files/patch-include__clplumbing__c1_uuid.h
@@ -0,0 +1,11 @@
+--- include/clplumbing/cl_uuid.h.orig	2013-02-07 16:26:11.000000000 +0000
++++ include/clplumbing/cl_uuid.h	2013-02-07 16:26:18.000000000 +0000
+@@ -16,7 +16,7 @@
+ 
+ #ifndef _CL_UUID_H_
+ #define _CL_UUID_H_
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ typedef struct cl_uuid_s{	
+ 	unsigned char	uuid[16];
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index dce8d0634d60..04eff4638924 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	nautilus-cd-burner
-# Date created:				13 April 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.149 2009/09/25 18:40:01 kwm Exp $
-#
 
 PORTNAME=	nautilus-cd-burner
 PORTVERSION=	2.24.0
@@ -36,16 +32,24 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	nautilus-cd-burner.schemas
 
-OPTIONS=	DVD "Enable DVD support" on
+OPTIONS_DEFINE=	DVD
+OPTIONS_DEFAULT=DVD
+DVD_DESC=	DVD support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_DVD)
+.if ${PORT_OPTIONS:MDVD}
 RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/g.*\.h>|glib.h>|g' \
+		${WRKSRC}/src/nautilus-burn.h \
+		${WRKSRC}/src/nautilus-burn-init.h \
+		${WRKSRC}/src/nautilus-cd-burner.h
+
 post-install:
 	-@update-desktop-database
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/polkit-gnome/Makefile b/sysutils/polkit-gnome/Makefile
index c85caf479c82..7e2c2385f6b3 100644
--- a/sysutils/polkit-gnome/Makefile
+++ b/sysutils/polkit-gnome/Makefile
@@ -1,29 +1,25 @@
-# New ports collection makefile for:   polkit-gnome
-# Date Created:			30 Juli 2009
-# Whom:				Koop Mast<kwm@FreeBSD.org>
-#
+# Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.14 2010/09/19 20:17:19 kwm Exp $
-#
+#   $MCom: ports/sysutils/polkit-gnome/Makefile,v 1.20 2012/12/18 13:05:11 kwm Exp $
 
 PORTNAME=	polkit-gnome
-PORTVERSION=	0.99
-PORTREVISION=	1
+PORTVERSION=	0.102
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://hal.freedesktop.org/releases/
+MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME frontend to the PolicyKit framework
 
-LIB_DEPENDS=	polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	polkit-gobject-1:${PORTSDIR}/sysutils/polkit
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk20 intlhack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
+		--with-gtk=2.0 \
 		--localstatedir=/var
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/sysutils/polkit-gnome/distinfo b/sysutils/polkit-gnome/distinfo
index 91a07efcaa3e..ecbe1371ff31 100644
--- a/sysutils/polkit-gnome/distinfo
+++ b/sysutils/polkit-gnome/distinfo
@@ -1,2 +1,2 @@
-SHA256 (polkit-gnome-0.99.tar.bz2) = 73c4d04aa89d9a9687f3650327c0ec1cba704e9d5b7fc193958fa81d621208ba
-SIZE (polkit-gnome-0.99.tar.bz2) = 388069
+SHA256 (polkit-gnome-0.102.tar.xz) = c78cee0001128dc1b00248ed11ffd23988d9cd0ce78c8b00eb36880b289e7598
+SIZE (polkit-gnome-0.102.tar.xz) = 335144
diff --git a/sysutils/polkit-gnome/pkg-plist b/sysutils/polkit-gnome/pkg-plist
index 97158f9e5f5e..8a83b404ae4b 100644
--- a/sysutils/polkit-gnome/pkg-plist
+++ b/sysutils/polkit-gnome/pkg-plist
@@ -1,4 +1,3 @@
-etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
 include/polkit-gtk-1/polkitgtk/polkitgtk.h
 include/polkit-gtk-1/polkitgtk/polkitgtktypes.h
 include/polkit-gtk-1/polkitgtk/polkitlockbutton.h
@@ -14,11 +13,13 @@ share/locale/ar/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/be/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/bn_IN/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/ca/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/ca@valencia/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/cs/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/da/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/de/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/el/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/en_GB/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/eo/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/es/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/eu/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/fi/LC_MESSAGES/polkit-gnome-1.mo
@@ -44,11 +45,15 @@ share/locale/ro/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/ru/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/sk/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/sl/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/sr/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/sr@latin/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/sv/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/ta/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/te/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/th/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/tr/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/uk/LC_MESSAGES/polkit-gnome-1.mo
+share/locale/vi/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/zh_CN/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/zh_HK/LC_MESSAGES/polkit-gnome-1.mo
 share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo
@@ -58,5 +63,9 @@ share/locale/zh_TW/LC_MESSAGES/polkit-gnome-1.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 3408391bfee3..3feb9dda3cc5 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -1,48 +1,51 @@
-# New ports collection makefile for:   polkit
-# Date Created:			30 Juli 2009
-# Whom:				Koop Mast<kwm@FreeBSD.org>
-#
+# Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/sysutils/polkit/Makefile,v 1.10 2010/09/16 02:09:43 avl Exp $
-#
+#   $MCom: ports/sysutils/polkit/Makefile,v 1.23 2012/12/18 13:01:54 kwm Exp $
 
 PORTNAME=	polkit
-PORTVERSION=	0.99
+PORTVERSION=	0.105
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://hal.freedesktop.org/releases/
+MASTER_SITES=	http://www.freedesktop.org/software/polkit/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Framework for controlling access to system-wide components
 
 BUILD_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	eggdbus-1.0:${PORTSDIR}/devel/eggdbus \
-		expat.6:${PORTSDIR}/textproc/expat2
-RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection
+LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2
+RUN_DEPENDS=	${LOCALBASE}/share/gir-1.0/GLib-2.0.gir:${PORTSDIR}/devel/gobject-introspection \
+		dbus-launch:${PORTSDIR}/devel/dbus
 
-USE_GNOME=	gnomehack glib20 intlhack
+USE_GNOME=	gnomehack glib20 intlhack gnomehier
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc \
 		--with-authfw=pam \
 		--with-pam-include=system \
 		--with-os-type=freebsd \
+		--disable-systemd \
 		--enable-introspection \
 		--localstatedir=/var
 CONFIGURE_ENV=	GTKDOC="false"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-.if defined(NO_INSTALL_MANPAGES)
-CONFIGURE_ARGS+=--disable-man-pages
-.else
+OPTIONS_DEFINE=	MANPAGES
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMANPAGES}
 BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1/dtd/catalog:${PORTSDIR}/textproc/docbook-410 \
     		xsltproc:${PORTSDIR}/textproc/libxslt \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
 
-MAN1=		pkaction.1 pkcheck.1 pkexec.1
+MAN1=		pkaction.1 pkcheck.1 pkexec.1 pkttyagent.1
 MAN8=		pklocalauthority.8 polkit.8 polkitd.8
+.else
+CONFIGURE_ARGS+=--disable-man-pages
 .endif
 
 post-patch:
diff --git a/sysutils/polkit/distinfo b/sysutils/polkit/distinfo
index bfcebc08b41e..bd125cce13d9 100644
--- a/sysutils/polkit/distinfo
+++ b/sysutils/polkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (polkit-0.99.tar.gz) = f612c7c26ec822f67751420057a4ae113fc50ab51070758faacf2ad30bb3583f
-SIZE (polkit-0.99.tar.gz) = 1042461
+SHA256 (polkit-0.105.tar.gz) = 8fdc7cc8ba4750fcce1a4db9daa759c12afebc7901237e1c993c38f08985e1df
+SIZE (polkit-0.105.tar.gz) = 1431080
diff --git a/sysutils/polkit/files/patch-Makefile.in b/sysutils/polkit/files/patch-Makefile.in
new file mode 100644
index 000000000000..665c13c7d361
--- /dev/null
+++ b/sysutils/polkit/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2012-05-15 22:09:33.000000000 +0200
++++ Makefile.in	2012-05-15 22:10:16.000000000 +0200
+@@ -292,7 +292,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = actions data src docs po test
++SUBDIRS = actions data src docs po
+ NULL = 
+ EXTRA_DIST = \
+ 	HACKING 		\
diff --git a/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c b/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c
new file mode 100644
index 000000000000..c5c5bd8dade8
--- /dev/null
+++ b/sysutils/polkit/files/patch-src_polkitagent_polkitagenthelperprivate.c
@@ -0,0 +1,12 @@
+--- src/polkitagent/polkitagenthelperprivate.c.orig	2011-02-23 18:18:11.000000000 +0000
++++ src/polkitagent/polkitagenthelperprivate.c	2011-02-23 18:18:41.000000000 +0000
+@@ -103,7 +103,7 @@ flush_and_wait ()
+ {
+   fflush (stdout);
+   fflush (stderr);
+-  fdatasync (fileno(stdout));
+-  fdatasync (fileno(stderr));
++  fsync (fileno(stdout));
++  fsync (fileno(stderr));
+   usleep (100 * 1000);
+ }
diff --git a/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c
new file mode 100644
index 000000000000..76a08f711bcc
--- /dev/null
+++ b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendinteractiveauthority.c
@@ -0,0 +1,11 @@
+--- src/polkitbackend/polkitbackendinteractiveauthority.c.orig	2012-05-15 21:52:38.000000000 +0200
++++ src/polkitbackend/polkitbackendinteractiveauthority.c	2012-05-15 21:52:49.000000000 +0200
+@@ -279,7 +279,7 @@
+   static volatile GQuark domain = 0;
+ 
+   /* Force registering error domain */
+-  domain = POLKIT_ERROR; domain;
++  domain = POLKIT_ERROR;
+ 
+   priv = POLKIT_BACKEND_INTERACTIVE_AUTHORITY_GET_PRIVATE (authority);
+ 
diff --git a/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c
new file mode 100644
index 000000000000..f4a57022e5f9
--- /dev/null
+++ b/sysutils/polkit/files/patch-src_polkitbackend_polkitbackendlocalauthority.c
@@ -0,0 +1,23 @@
+--- src/polkitbackend/polkitbackendlocalauthority.c.orig	2012-05-15 21:52:35.000000000 +0200
++++ src/polkitbackend/polkitbackendlocalauthority.c	2012-05-15 21:53:07.000000000 +0200
+@@ -700,11 +700,7 @@
+   ret = NULL;
+   name = polkit_unix_netgroup_get_name (POLKIT_UNIX_NETGROUP (group));
+ 
+-  if (setnetgrent (name) == 0)
+-    {
+-      g_warning ("Error looking up net group with name %s: %s", name, g_strerror (errno));
+-      goto out;
+-    }
++  setnetgrent (name);
+ 
+   for (;;)
+     {
+@@ -737,7 +733,6 @@
+ 
+   ret = g_list_reverse (ret);
+ 
+- out:
+   endnetgrent ();
+   return ret;
+ }
diff --git a/sysutils/polkit/files/patch-src_programs_pkexec.c b/sysutils/polkit/files/patch-src_programs_pkexec.c
deleted file mode 100644
index 620ebae15918..000000000000
--- a/sysutils/polkit/files/patch-src_programs_pkexec.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/programs/pkexec.c.orig	2010-01-18 02:52:40.000000000 -0500
-+++ src/programs/pkexec.c	2010-01-18 03:06:57.000000000 -0500
-@@ -438,7 +438,7 @@ main (int argc, char *argv[])
-       goto out;
-     }
- 
--  original_cwd = g_strdup (get_current_dir_name ());
-+  original_cwd = g_strdup (getcwd (NULL, 0));
-   if (original_cwd == NULL)
-     {
-       g_printerr ("Error getting cwd.\n");
diff --git a/sysutils/polkit/pkg-descr b/sysutils/polkit/pkg-descr
index 9746a6470c1d..4f0b6a299e16 100644
--- a/sysutils/polkit/pkg-descr
+++ b/sysutils/polkit/pkg-descr
@@ -1,4 +1,4 @@
 PolicyKit is a framework for defining policy for system-wide components and
 for desktop pieces to configure it. It is used by HAL.
 
-WWW: http://www.freedesktop.org/wiki/Software/PolicyKit
+WWW: http://www.freedesktop.org/wiki/Software/polkit
diff --git a/sysutils/polkit/pkg-plist b/sysutils/polkit/pkg-plist
index 5f7672022836..e30e9a7d7e01 100644
--- a/sysutils/polkit/pkg-plist
+++ b/sysutils/polkit/pkg-plist
@@ -1,6 +1,8 @@
+bin/pk-example-frobnicate
 bin/pkaction
 bin/pkcheck
 bin/pkexec
+bin/pkttyagent
 @unexec if cmp -s %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist; then rm -f %D/etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf ; fi
 etc/dbus-1/system.d/org.freedesktop.PolicyKit1.conf.dist
 @exec [ -f %B/org.freedesktop.PolicyKit1.conf ] || cp %B/%f %B/org.freedesktop.PolicyKit1.conf
@@ -25,6 +27,7 @@ include/polkit-1/polkit/polkitsystembusname.h
 include/polkit-1/polkit/polkittemporaryauthorization.h
 include/polkit-1/polkit/polkittypes.h
 include/polkit-1/polkit/polkitunixgroup.h
+include/polkit-1/polkit/polkitunixnetgroup.h
 include/polkit-1/polkit/polkitunixprocess.h
 include/polkit-1/polkit/polkitunixsession.h
 include/polkit-1/polkit/polkitunixuser.h
@@ -41,6 +44,7 @@ include/polkit-1/polkitbackend/polkitbackendinteractiveauthority.h
 include/polkit-1/polkitbackend/polkitbackendlocalauthority.h
 include/polkit-1/polkitbackend/polkitbackendtypes.h
 lib/girepository-1.0/Polkit-1.0.typelib
+lib/girepository-1.0/PolkitAgent-1.0.typelib
 lib/libpolkit-agent-1.a
 lib/libpolkit-agent-1.la
 lib/libpolkit-agent-1.so
@@ -56,9 +60,6 @@ lib/libpolkit-gobject-1.so.0
 lib/polkit-1/extensions/libnullbackend.a
 lib/polkit-1/extensions/libnullbackend.la
 lib/polkit-1/extensions/libnullbackend.so
-lib/polkit-1/extensions/libpkexec-action-lookup.a
-lib/polkit-1/extensions/libpkexec-action-lookup.la
-lib/polkit-1/extensions/libpkexec-action-lookup.so
 libdata/pkgconfig/polkit-agent-1.pc
 libdata/pkgconfig/polkit-backend-1.pc
 libdata/pkgconfig/polkit-gobject-1.pc
@@ -66,7 +67,9 @@ libexec/polkit-agent-helper-1
 libexec/polkitd
 share/dbus-1/system-services/org.freedesktop.PolicyKit1.service
 share/gir-1.0/Polkit-1.0.gir
+share/gir-1.0/PolkitAgent-1.0.gir
 share/locale/da/LC_MESSAGES/polkit-1.mo
+share/polkit-1/actions/org.freedesktop.policykit.examples.pkexec.policy
 share/polkit-1/actions/org.freedesktop.policykit.policy
 @dirrmtry share/polkit-1/actions
 @dirrmtry share/polkit-1
diff --git a/sysutils/rdup/Makefile b/sysutils/rdup/Makefile
index addcd2c6f103..894fef57d4ed 100644
--- a/sysutils/rdup/Makefile
+++ b/sysutils/rdup/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	glib-2.0:${PORTSDIR}/devel/glib20 \
 USE_BZIP2=	yes
 
 USE_AUTOTOOLS=	autoconf
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib