author: Koop Mast <kwm@FreeBSD.org> 2013-03-08 10:51:34 +0000
committer: Koop Mast <kwm@FreeBSD.org> 2013-03-08 10:51:34 +0000
commit: 7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch)
tree: 961839899dce7f75292a08c079f548973bdbd40d /devel
parent: 85544f2c01be814e0af1ebee1076012e7ed60bb0 (diff)
121 files changed, 1174 insertions, 831 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 0c83cace6d6c..c7e677c2e1a4 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -327,6 +327,7 @@
     SUBDIR += dbus-sharp-glib
     SUBDIR += dcmtk
     SUBDIR += dconf
+    SUBDIR += dconf-editor
     SUBDIR += ddd
     SUBDIR += deforaos-libsystem
     SUBDIR += deheader
@@ -978,6 +979,7 @@
     SUBDIR += libgconf-java
     SUBDIR += libgdata
     SUBDIR += libgee
+    SUBDIR += libgee06
     SUBDIR += libgetline
     SUBDIR += libghthash
     SUBDIR += libgii
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 0c4ce73300c0..07f53488181d 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   orbit2
-# Date Created:			16 Aug 1998
-# Whom:				Chia-liang Kao <clkao@CirX.ORG>
-#
+# Created by: Chia-liang Kao <clkao@CirX.ORG>
 # $FreeBSD$
 #   $MCom: ports/devel/ORBit2/Makefile,v 1.57 2010/09/29 14:08:02 kwm Exp $
-#
 
 PORTNAME=	ORBit2
 PORTVERSION=	2.14.19
@@ -25,6 +21,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack libidl ltverhack referencehack
+USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/dbus-sharp/Makefile b/devel/dbus-sharp/Makefile
index 8c870c4660c7..15b16891e7e6 100644
--- a/devel/dbus-sharp/Makefile
+++ b/devel/dbus-sharp/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
+USE_PKGCONFIG=	build
 
 .include "${.CURDIR}/../../lang/mono/bsd.mono.mk"
 .include <bsd.port.mk>
diff --git a/devel/dconf-editor/Makefile b/devel/dconf-editor/Makefile
new file mode 100644
index 000000000000..57e6d47e38ef
--- /dev/null
+++ b/devel/dconf-editor/Makefile
@@ -0,0 +1,22 @@
+# Created by: Koop Mast <kwm@FreeBSD.org>
+# $FreeBSD$
+#   $MCom: ports/devel/dconf-editor/Makefile,v 1.2 2012/12/16 22:43:23 kwm Exp $
+
+PORTNAME=	dconf
+PKGNAMESUFFIX=	-editor
+
+COMMENT=	configuration editor for dconf
+
+DCONF_SLAVE=	editor
+
+MASTERDIR=	${.CURDIR}/../dconf
+
+PLIST=		${.CURDIR}/pkg-plist
+
+do-build:
+	@cd ${WRKSRC}/editor && ${GMAKE}
+
+do-install:
+	@cd ${WRKSRC}/editor && ${GMAKE} install
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/dconf-editor/pkg-plist b/devel/dconf-editor/pkg-plist
new file mode 100644
index 000000000000..5c035237dba4
--- /dev/null
+++ b/devel/dconf-editor/pkg-plist
@@ -0,0 +1,9 @@
+bin/dconf-editor
+share/applications/dconf-editor.desktop
+share/dconf-editor/dconf-editor.ui
+share/icons/hicolor/128x128/apps/dconf-editor.png
+share/icons/hicolor/32x32/apps/dconf-editor.png
+share/icons/hicolor/48x48/apps/dconf-editor.png
+share/icons/hicolor/64x64/apps/dconf-editor.png
+@dirrm share/dconf-editor
+@dirrmtry share/applications
diff --git a/devel/dconf/Makefile b/devel/dconf/Makefile
index 21df21c88cc6..d392d7ac9acc 100644
--- a/devel/dconf/Makefile
+++ b/devel/dconf/Makefile
@@ -1,41 +1,61 @@
-# New ports collection makefile for:	dconf
-# Date created:				28 May 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/dconf/Makefile,v 1.9 2010/11/04 16:41:01 kwm Exp $
-#
+#   $MCom: ports/devel/dconf/Makefile,v 1.30 2012/10/03 17:57:17 kwm Exp $
 
-PORTNAME=	dconf
-PORTVERSION=	0.5.1
-PORTREVISION=	4
+PORTNAME?=	dconf
+PORTVERSION=	0.12.1
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
+DISTNAME=	dconf-${PORTVERSION}
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A configuration database system for GNOME
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		valac:${PORTSDIR}/lang/vala
-LIB_DEPENDS=	gee.2:${PORTSDIR}/devel/libgee
+BUILD_DEPENDS=	vala>=0.11.7:${PORTSDIR}/lang/vala
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
-#USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gtk20
+USE_GNOME=	gnomehack glib20 gnomehier
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-
-MAKE_JOBS_SAFE=	yes
-
+MAKE_JOBS_UNSAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+DCONF_SLAVE?=	no
+
+.if ${DCONF_SLAVE} == "editor"
+USE_GNOME+=	gtk30
+INSTALLS_ICONS=	yes
+GLIB_SCHEMAS=	ca.desrt.dconf-editor.gschema.xml
+LIB_DEPENDS+=	dconf:${PORTSDIR}/devel/dconf
+.else
+CONFIGURE_ARGS+=--disable-editor
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
+		${WRKSRC}/engine/dconf-engine.c \
+		${WRKSRC}/bin/dconf-update.c
+	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' \
+		${WRKSRC}/editor/dconf-model.c
+	@${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|g' \
+		${WRKSRC}/editor/dconf-model.vala
+	@${REINPLACE_CMD} -e 's|-Wno-unused-but-set-variable||g' \
+		${WRKSRC}/bin/Makefile.in \
+		${WRKSRC}/client/Makefile.in \
+		${WRKSRC}/editor/Makefile.in
+
 pre-build:
-	${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
+#	${GMAKE} -C ${WRKSRC}/client dconf-client.c libdconf.so.0
+#	${GMAKE} -C ${WRKSRC}/dbus-1 dconf-dbus-1.c libdconf-dbus-1.so.0
 
 post-install:
 	-${LOCALBASE}/bin/gio-querymodules ${PREFIX}/lib/gio/modules
+	@${MKDIR} ${PREFIX}/etc/dconf/db
+	@${MKDIR} ${PREFIX}/etc/dconf/profile
 
 .include <bsd.port.mk>
diff --git a/devel/dconf/distinfo b/devel/dconf/distinfo
index 60e18dfbf33e..eccaa2835e51 100644
--- a/devel/dconf/distinfo
+++ b/devel/dconf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/dconf-0.5.1.tar.bz2) = 0083d70e1b5e540d8d4b3f04fa5d17dff4c574136682fe3bdd9b5ecc196ec4f6
-SIZE (gnome3/dconf-0.5.1.tar.bz2) = 251287
+SHA256 (gnome3/dconf-0.12.1.tar.xz) = 3cd32b78d88ed7be90dace5d45e2cf8a6abdb253d43dbfa5ef52103b329dc214
+SIZE (gnome3/dconf-0.12.1.tar.xz) = 202112
diff --git a/devel/dconf/files/patch-client_Makefile.in b/devel/dconf/files/patch-client_Makefile.in
index f0452b9173db..d97d83186173 100644
--- a/devel/dconf/files/patch-client_Makefile.in
+++ b/devel/dconf/files/patch-client_Makefile.in
@@ -1,5 +1,5 @@
---- client/Makefile.in.orig	2010-11-04 17:09:33.000000000 +0100
-+++ client/Makefile.in	2010-11-04 17:18:20.000000000 +0100
+--- client/Makefile.in.orig	2012-05-28 13:27:17.000000000 +0200
++++ client/Makefile.in	2012-05-28 13:31:25.000000000 +0200
 @@ -34,7 +34,7 @@
  NORMAL_UNINSTALL = :
  PRE_UNINSTALL = :
@@ -7,31 +7,27 @@
 -shlib_PROGRAMS = libdconf.so.0.0.0$(EXEEXT)
 +shlib_PROGRAMS = libdconf.so.0$(EXEEXT)
  subdir = client
- DIST_COMMON = $(am__dist_gir_DATA_DIST) $(dconfinclude_HEADERS) \
- 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ DIST_COMMON = $(dconfinclude_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/dconf.pc.in dconf-client.c \
 @@ -332,9 +332,10 @@
  
  clean-shlibPROGRAMS:
  	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
--libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) 
--	@rm -f libdconf.so.0.0.0$(EXEEXT)
-+libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) 
-+	@rm -f libdconf.so.0$(EXEEXT)
+-libdconf.so.0.0.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) 
++libdconf.so.0$(EXEEXT): $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_so_0_0_0_DEPENDENCIES) 
+ 	@rm -f libdconf.so.0.0.0$(EXEEXT)
  	$(AM_V_CCLD)$(libdconf_so_0_0_0_LINK) $(libdconf_so_0_0_0_OBJECTS) $(libdconf_so_0_0_0_LDADD) $(LIBS)
 +	$(AM_V_GEN) ln -fs libdconf.so.0 libdconf.so
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -750,14 +751,10 @@
+@@ -695,12 +696,8 @@
+ 	uninstall-vapiDATA
  
- @HAVE_INTROSPECTION_TRUE@include $(INTROSPECTION_MAKEFILE)
  
--@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0 libdconf.so
--
 -libdconf.so.0 libdconf.so: libdconf.so.0.0.0
 -	$(AM_V_GEN) ln -fs libdconf.so.0.0.0 $@
-+@HAVE_INTROSPECTION_TRUE@dconf-1.0.gir: libdconf.so.0
- 
+-
  install-data-hook:
 -	ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.0
 -	ln -fs libdconf.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
diff --git a/devel/dconf/files/patch-common_shmdir.c b/devel/dconf/files/patch-common_shmdir.c
deleted file mode 100644
index b8ed3eeb2080..000000000000
--- a/devel/dconf/files/patch-common_shmdir.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- common/dconf-shmdir.c.orig	2010-10-21 13:46:17.000000000 +0200
-+++ common/dconf-shmdir.c	2010-10-21 13:47:46.000000000 +0200
-@@ -21,8 +21,13 @@
- 
- #include "dconf-shmdir.h"
- 
-+#ifdef __linux__
- #include <sys/statfs.h>
- #include <sys/vfs.h>
-+#elif __FreeBSD__
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#endif
- #include <errno.h>
- 
- #ifndef NFS_SUPER_MAGIC
diff --git a/devel/dconf/files/patch-dbus-1_Makefile.in b/devel/dconf/files/patch-dbus-1_Makefile.in
new file mode 100644
index 000000000000..907188b52967
--- /dev/null
+++ b/devel/dconf/files/patch-dbus-1_Makefile.in
@@ -0,0 +1,47 @@
+--- dbus-1/Makefile.in.orig	2012-05-28 13:31:56.000000000 +0200
++++ dbus-1/Makefile.in	2012-05-28 13:35:25.000000000 +0200
+@@ -34,7 +34,7 @@
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-shlib_PROGRAMS = libdconf-dbus-1.so.0.0.0$(EXEEXT)
++shlib_PROGRAMS = libdconf-dbus-1.so.0$(EXEEXT)
+ subdir = dbus-1
+ DIST_COMMON = $(dconf_dbus_1include_HEADERS) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/dconf-dbus-1.pc.in
+@@ -246,7 +246,7 @@
+ 	../gvdb/gvdb-reader.c		\
+ 	dconf-dbus-1.c
+ 
+-noinst_DATA = libdconf-dbus-1.so libdconf-dbus-1.so.0
++noinst_DATA = libdconf-dbus-1.so.0
+ CLEANFILES = libdconf-dbus-1.so.0 libdconf-dbus-1.so
+ all: all-am
+ 
+@@ -321,9 +321,10 @@
+ 
+ clean-shlibPROGRAMS:
+ 	-test -z "$(shlib_PROGRAMS)" || rm -f $(shlib_PROGRAMS)
+-libdconf-dbus-1.so.0.0.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) 
+-	@rm -f libdconf-dbus-1.so.0.0.0$(EXEEXT)
++libdconf-dbus-1.so.0$(EXEEXT): $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_DEPENDENCIES) $(EXTRA_libdconf_dbus_1_so_0_0_0_DEPENDENCIES) 
++	@rm -f libdconf-dbus-1.so.0$(EXEEXT)
+ 	$(AM_V_CCLD)$(libdconf_dbus_1_so_0_0_0_LINK) $(libdconf_dbus_1_so_0_0_0_OBJECTS) $(libdconf_dbus_1_so_0_0_0_LDADD) $(LIBS)
++	$(AM_V_GEN) ln -fs libdconf-dbus-1.so.0 libdconf-dbus-1.so
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -640,12 +641,8 @@
+ 	uninstall-hook uninstall-pkgconfigDATA uninstall-shlibPROGRAMS
+ 
+ 
+-libdconf-dbus-1.so.0 libdconf-dbus-1.so: libdconf-dbus-1.so.0.0.0
+-	$(AM_V_GEN) ln -fs libdconf-dbus-1.so.0.0.0 $@
+-
+ install-data-hook:
+-	ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
+-	ln -fs libdconf-dbus-1.so.0.0.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
++	ln -fs libdconf-dbus-1.so.0 $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so
+ 
+ uninstall-hook:
+ 	rm -f $(DESTDIR)$(shlibdir)/libdconf-dbus-1.so.0
diff --git a/devel/dconf/files/patch-editor_Makefile.in b/devel/dconf/files/patch-editor_Makefile.in
new file mode 100644
index 000000000000..8f158fced556
--- /dev/null
+++ b/devel/dconf/files/patch-editor_Makefile.in
@@ -0,0 +1,20 @@
+--- editor/Makefile.in.orig	2012-10-03 17:32:51.000000000 +0000
++++ editor/Makefile.in	2012-10-03 17:35:54.000000000 +0000
+@@ -55,7 +55,7 @@
+ 	dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
+ dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
+ am__DEPENDENCIES_1 =
+-dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \
++dconf_editor_DEPENDENCIES = -ldconf \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+@@ -232,7 +232,7 @@
+ top_srcdir = @top_srcdir@
+ AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\"
+ AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf
+-dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
++dconf_editor_LDADD = -ldconf $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
+ dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala
+ desktopdir = $(datadir)/applications
+ desktop_in_files = dconf-editor.desktop.in.in
diff --git a/devel/dconf/files/patch-engine_dconf-engine.c b/devel/dconf/files/patch-engine_dconf-engine.c
deleted file mode 100644
index 328a8f53fe5f..000000000000
--- a/devel/dconf/files/patch-engine_dconf-engine.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- engine/dconf-engine.c.orig	2010-08-04 17:40:53.000000000 +0200
-+++ engine/dconf-engine.c	2010-11-03 00:23:07.000000000 +0100
-@@ -144,7 +144,7 @@ dconf_engine_setup_user (DConfEngine *en
- 
-           if (fd >= 0)
-             {
--              if (posix_fallocate (fd, 0, 1) == 0)
-+              if (ftruncate (fd, 1) == 0)
-                 {
-                   engine->shm = mmap (NULL, 1, PROT_READ, MAP_SHARED, fd, 0);
- 
diff --git a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c b/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c
deleted file mode 100644
index 4fe175035d88..000000000000
--- a/devel/dconf/files/patch-gsettings_dconfsettingsbackend.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- gsettings/dconfsettingsbackend.c.orig	2010-11-03 00:18:46.000000000 +0100
-+++ gsettings/dconfsettingsbackend.c	2010-11-03 00:21:03.000000000 +0100
-@@ -155,6 +155,7 @@ dconf_settings_backend_remove_outstandin
-                                       g_dbus_message_get_sender (message),
-                                       g_dbus_message_get_body (message),
-                                       anti_expose, NULL);
-+        g_slice_free (Outstanding, tmp);
- 
-         found = TRUE;
-         break;
-@@ -457,6 +458,7 @@ dconf_settings_backend_write_tree (GSett
-                                    gpointer          origin_tag)
- {
-   DConfSettingsBackend *dcsb = (DConfSettingsBackend *) backend;
-+  gboolean success = FALSE;
-   volatile guint32 *serial;
-   DConfEngineMessage dcem;
-   GDBusConnection *bus;
-@@ -478,15 +480,11 @@ dconf_settings_backend_write_tree (GSett
- 
-           g_settings_backend_keys_changed (backend, prefix, keys, origin_tag);
- 
--          return TRUE;
-+          success = TRUE;
-         }
-     }
- 
--  g_free (prefix);
--  g_free (values);
--  g_free (keys);
--
--  return FALSE;
-+  return success;
- }
- 
- static void
diff --git a/devel/dconf/pkg-plist b/devel/dconf/pkg-plist
index 3f2a96fbe976..167169ca8e7c 100644
--- a/devel/dconf/pkg-plist
+++ b/devel/dconf/pkg-plist
@@ -1,26 +1,24 @@
 bin/dconf
-bin/dconf-editor
+etc/bash_completion.d/dconf-bash-completion.sh
 include/dconf/dconf-client.h
+include/dconf-dbus-1/dconf-dbus-1.h
 include/dconf/dconf-engine.h
 include/dconf/dconf-paths.h
-include/dconf/dconf-readtype.h
-include/dconf/dconf-resetlist.h
 include/dconf/dconf.h
 lib/gio/modules/libdconfsettings.so
-lib/girepository-1.0/dconf-1.0.typelib
 lib/libdconf.so
 lib/libdconf.so.0
+lib/libdconf-dbus-1.so
+lib/libdconf-dbus-1.so.0
 libdata/pkgconfig/dconf.pc
+libdata/pkgconfig/dconf-dbus-1.pc
 libexec/dconf-service
 share/dbus-1/services/ca.desrt.dconf.service
-share/dbus-1/system-services/ca.desrt.dconf.service
-share/gir-1.0/dconf-1.0.gir
 share/gtk-doc/html/dconf/DConfClient.html
 share/gtk-doc/html/dconf/dconf-DConf-Paths.html
 share/gtk-doc/html/dconf/annotation-glossary.html
 share/gtk-doc/html/dconf/api-index-full.html
 share/gtk-doc/html/dconf/ch01.html
-share/gtk-doc/html/dconf/dconf.devhelp
 share/gtk-doc/html/dconf/dconf.devhelp2
 share/gtk-doc/html/dconf/home.png
 share/gtk-doc/html/dconf/index.html
@@ -32,13 +30,11 @@ share/gtk-doc/html/dconf/style.css
 share/gtk-doc/html/dconf/up.png
 share/vala/vapi/dconf.deps
 share/vala/vapi/dconf.vapi
-@dirrmtry share/vala/vapi
 @dirrm share/gtk-doc/html/dconf
 @dirrmtry share/gtk-doc/html
 @dirrmtry share/gtk-doc
-@dirrmtry share/dbus-1/system-services
-@dirrmtry share/dbus-1/services
-@dirrmtry share/dbus-1
+@dirrm include/dconf-dbus-1
 @dirrm include/dconf
 @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
 @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@dirrmtry etc/bash_completion.d
diff --git a/devel/desktop-file-utils/Makefile b/devel/desktop-file-utils/Makefile
index b18e8a7459b8..a9de60394431 100644
--- a/devel/desktop-file-utils/Makefile
+++ b/devel/desktop-file-utils/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	desktop-file-utils
-# Date created:			11 Jun 2004
-# Whom:				Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
 #   $MCom: ports/devel/desktop-file-utils/Makefile,v 1.8 2007/09/07 20:22:45 mezz Exp $
-#
 
 PORTNAME=	desktop-file-utils
 PORTVERSION=	0.18
@@ -18,7 +14,7 @@ USE_GNOME=	glib20
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-WANT_GNOME=	yes
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-lispdir
 CONFIGURE_ENV=	EMACS="no"
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index cb883bb58ee1..a98a7c99670f 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   eggdbus
-# Date Created:			30 Juli 2009
-# Whom:				Koop Mast<kwm@FreeBSD.org>
-#
+# Created by: Koop Mast<kwm@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/eggdbus/Makefile,v 1.3 2009/11/24 01:46:27 marcus Exp $
-#
 
 PORTNAME=	eggdbus
 PORTVERSION=	0.6
@@ -15,9 +11,9 @@ MASTER_SITES=	http://hal.freedesktop.org/releases/
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	D-Bus bindings for GObject
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USE_GNOME=	pkgconfig glib20 gnomehack
+USE_GNOME=	glib20 gnomehack
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_UNSAFE=yes
diff --git a/devel/eris/Makefile b/devel/eris/Makefile
index cf642892b161..f6c20b55ac6c 100644
--- a/devel/eris/Makefile
+++ b/devel/eris/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	Atlas-0.6.1:${PORTSDIR}/devel/atlas-devel \
 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+USE_PKGCONFIG=	build
 USE_GNOME=	gnomehack
 
 CXXFLAGS+=	-include wchar.h
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index cc660f832b9f..867761853f6e 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,10 +1,6 @@
-# Ports collection makefile for:	g-wrap
-# Date created:		Jun 29, 2000
-# Whom:			Matthew Condell (mcondell@alum.mit.edu)
-#
+# Created by: Matthew Condell (mcondell@alum.mit.edu)
 # $FreeBSD$
 #    $MCom: ports/devel/g-wrap/Makefile,v 1.6 2006/12/24 18:45:08 ahze Exp $
-#
 
 PORTNAME=	g-wrap
 PORTVERSION=	1.9.6
@@ -14,7 +10,7 @@ CATEGORIES=	devel scheme
 MASTER_SITES=	SAVANNAH
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	A tool for exporting C libraries into Scheme interpreters
+COMMENT=	Tool for exporting C libraries into Scheme interpreters
 
 BUILD_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
 		slib-guile>0:${PORTSDIR}/lang/slib-guile
@@ -28,6 +24,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=${ARCH:S/amd64/x86_64/}-portbld-freebsd${OSREL}
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack
+USE_PKGCONFIG=	build
 NOT_FOR_ARCHS=	ia64 powerpc
 
 CFLAGS+=		-fPIC
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 80a3435d5b69..cab49234d341 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -25,4 +25,8 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
+		${WRKSRC}/gconf/gconfmm/client.cc
+
 .include <bsd.port.mk>
diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile
index 96d6d9e602c1..9b7cbb7b1e45 100644
--- a/devel/giggle/Makefile
+++ b/devel/giggle/Makefile
@@ -28,7 +28,7 @@ USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+LDFLAGS+=	-L${LOCALBASE}/lib -lintl `pkg-config -libs gmodule-2.0`
 PLIST_SUB+=	GIGGLE_VER=${PORTVERSION}
 
 .include <bsd.port.options.mk>
diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 8a7fa526ccdf..6996cacb5c3f 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:   gio-fam-backend
-# Date Created:			22 December 2007
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.82 2011/06/11 19:51:14 mezz Exp $
-#
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.96 2012/12/09 20:42:55 kwm Exp $
 
 PORTNAME=	gio-fam-backend
-PORTVERSION=	2.28.8
-PORTREVISION=	1
+PORTVERSION=	2.34.3
+PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -27,7 +23,8 @@ USE_XZ=		yes
 BUILD_WRKSRC=	${WRKSRC}/gio/fam
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig _glib20
+USE_PKGCONFIG=	build
+USE_GNOME=	gnomehack _glib20
 USE_FAM=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index 93d831f49734..57207bc60785 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.28.8.tar.xz) = 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
-SIZE (gnome2/glib-2.28.8.tar.xz) = 5223564
+SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7
+SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872
diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae
index 2e1ead9eaf8c..9c9caf0ab20c 100644
--- a/devel/gio-fam-backend/files/patch-ae
+++ b/devel/gio-fam-backend/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	2010-03-03 21:31:46.000000000 -0500
-+++ configure	2010-03-03 21:47:47.000000000 -0500
-@@ -714,6 +714,9 @@ ac_includes_default="\
+--- configure.orig	2013-02-14 19:12:15.000000000 +0000
++++ configure	2013-02-14 19:13:51.000000000 +0000
+@@ -603,6 +603,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
@@ -10,12 +10,34 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -23020,7 +23023,7 @@ _ACEOF
+@@ -5602,7 +5605,7 @@
+ fi
+ 
+ GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
+-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
++ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
+ 
+ 
+  if test "x$with_runtime_libdir" != "x"; then
+@@ -23647,7 +23650,7 @@
  fi
  done
  
--for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -27108,10 +27111,10 @@
+ #  b) FreeBSD doesn't do this either.
+ #
+ case $host in
+-  *-*-freebsd*|*-*-linux*)
++  *-*-linux*)
+     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`"
+     ;;
+-  *-*-openbsd*)
++  *-*-freebsd*|*-*-openbsd*)
+     LDFLAGS="$LDFLAGS -pthread"
+     ;;
+   *)
diff --git a/devel/glib-java/Makefile b/devel/glib-java/Makefile
index 2a3cdd4e4322..6eec3866c30a 100644
--- a/devel/glib-java/Makefile
+++ b/devel/glib-java/Makefile
@@ -20,6 +20,7 @@ USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 JAVA_OS=	native
 USE_GNOME=	gnomehack glib20
+USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--without-gcj-compile --with-jardir=${JAVAJARDIR}
 CPPFLAGS+=	-I${JAVA_HOME}/include -I${JAVA_HOME}/include/freebsd
 GLIB_API_VERSION=	0.4
@@ -30,6 +31,8 @@ PKGMESSAGE=		${WRKDIR}/pkg-message
 CONFIGURE_ENV+=	BOOTCLASSPATH=${JAVA_CLASSES}
 MAKE_ENV+=	BOOTCLASSPATH=${JAVA_CLASSES}
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
 		${WRKSRC}/configure
@@ -51,7 +54,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/macros/* ${PREFIX}/share/${PORTNAME}/macros
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
diff --git a/devel/glib-java/files/patch-src__jni__jg_jnu.c b/devel/glib-java/files/patch-src__jni__jg_jnu.c
new file mode 100644
index 000000000000..484b73d8d48a
--- /dev/null
+++ b/devel/glib-java/files/patch-src__jni__jg_jnu.c
@@ -0,0 +1,10 @@
+--- src/jni/jg_jnu.c.orig	2013-02-11 19:12:37.000000000 +0000
++++ src/jni/jg_jnu.c	2013-02-11 19:13:27.000000000 +0000
+@@ -5,7 +5,6 @@
+ 
+ #include "jg_jnu.h"
+ #include <stddef.h>
+-#include <glib/gmem.h>
+ #include <glib.h>
+ #include <string.h>
+ 
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 1702b64a48fd..3a5b317c327b 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   glib12
-# Date Created:			28 July 1998
-# Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
-#
+# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	glib
 PORTVERSION=	1.2.10
@@ -16,7 +12,6 @@ COMMENT=	Some useful routines of C programming (previous stable version)
 
 USE_CSTD=	gnu89
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/glib12
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 540d9c1dbc5c..103dd28d82b6 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,59 +1,65 @@
-# New ports collection makefile for:   glib13
-# Date Created:			28 July 1998
-# Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
-#
+# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.209 2011/06/11 19:51:14 mezz Exp $
-#
+#   $MCom: ports/devel/glib20/Makefile,v 1.229 2012/12/09 20:42:55 kwm Exp $
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.28.8
-PORTREVISION?=	5
+PORTVERSION=	2.34.3
+PORTREVISION?=	0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
-		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
-		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-		http://www.ameth.org/gimp/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Some useful routines of C programming (current stable version)
 
-LATEST_LINK=	glib20
+LICENSE=	LGPL20
 
+LATEST_LINK=	glib20
 USE_XZ=		yes
-LICENSE=	LGPL20
-LICENSE_FILE=	${WRKSRC}/COPYING
+PORTSCOUT=	limitw:1,even
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS+=	pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
+		ffi:${PORTSDIR}/devel/libffi
 
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig ltverhack
+USE_PKGCONFIG=	build
+USE_GNOME=	gnomehack ltverhack
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_PYTHON=	yes
+USE_PYTHON=	2.5+
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
-		--disable-dtrace \
 		--with-pcre=system \
 		--disable-fam
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
 
-OPTIONS=	COLLATION_FIX "fix string collation" off
+OPTIONS_DEFINE=	COLLATION_FIX DEBUG
+COLLATION_FIX_DESC=	fix string collation
 
 .include <bsd.port.pre.mk>
 
+# doesn't build yet
+#.if (${OSVERSION} < 800000) \
+#	|| (${OSVERSION} >= 800000 && ${OSVERSION} < 802000)
+#	|| (${OSVERSION} >= 900000 && ${OSVERSION} < 900021)
+CONFIGURE_ARGS+=--disable-dtrace
+#.else
+#CONFIGURE_ARGS+=--enable-dtrace
+#.endif
+
+.if ${ARCH} == powerpc64
+EXTRA_PATCHES=	${FILESDIR}/extra-arch-powerpc64
+.endif
+
 # Let glib use asm code for implementing atomic ops on i386 and amd64.
 .if ${ARCH} == "i386"
 GLIB_ARCH=	i486
@@ -64,7 +70,7 @@ GLIB_ARCH=	${ARCH}
 .endif
 CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL}
 
-.if defined(WITH_COLLATION_FIX)
+.if ${PORT_OPTIONS:MCOLLATION_FIX}
 LIB_DEPENDS+=	icui18n:${PORTSDIR}/devel/icu
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 		${FILESDIR}/extra-patch-glib_gunicollate.c
@@ -72,8 +78,11 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 #CONFIGURE_ENV+=	CFLAGS="-D__STDC_ISO_10646__"
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug=yes
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug=yes \
+			--disable-silent-rules
+.else
+CONFIGURE_ARGS+=	--disable-modular-tests
 .endif
 
 post-patch:
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 93d831f49734..57207bc60785 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.28.8.tar.xz) = 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
-SIZE (gnome2/glib-2.28.8.tar.xz) = 5223564
+SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7
+SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872
diff --git a/devel/glib20/files/extra-arch-powerpc64 b/devel/glib20/files/extra-arch-powerpc64
new file mode 100644
index 000000000000..d774ebd6b7b1
--- /dev/null
+++ b/devel/glib20/files/extra-arch-powerpc64
@@ -0,0 +1,23 @@
+
+--- gio/glib-compile-schemas.c.orig	2010-11-24 21:32:15.000000000 +0100
++++ gio/glib-compile-schemas.c	2010-11-24 21:33:42.000000000 +0100
+@@ -1458,7 +1458,7 @@
+ }
+ /* Text {{{2 */
+ static void
+-text (GMarkupParseContext  *context,
++XXXtext (GMarkupParseContext  *context,
+       const gchar          *text,
+       gsize                 text_len,
+       gpointer              user_data,
+@@ -1590,7 +1590,7 @@
+ parse_gschema_files (gchar    **files,
+                      gboolean   strict)
+ {
+-  GMarkupParser parser = { start_element, end_element, text };
++  GMarkupParser parser = { start_element, end_element, XXXtext };
+   ParseState state = { 0, };
+   const gchar *filename;
+   GError *error = NULL;
+
+
diff --git a/devel/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
index 01f856f74c03..04e45460c4c8 100644
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ b/devel/glib20/files/extra-patch-glib_Makefile.in
@@ -1,11 +1,11 @@
---- glib/Makefile.in.orig	2009-05-31 13:14:18.000000000 +0200
-+++ glib/Makefile.in	2009-05-31 13:15:08.000000000 +0200
-@@ -272,7 +272,7 @@
+--- glib/Makefile.in.orig	2012-09-27 15:07:28.000000000 +0000
++++ glib/Makefile.in	2012-09-27 15:08:02.000000000 +0000
+@@ -415,7 +415,7 @@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
  LD = @LD@
 -LDFLAGS = @LDFLAGS@
 +LDFLAGS = @LDFLAGS@ -licui18n
- LIBASYNCNS_LIBADD = @LIBASYNCNS_LIBADD@
- LIBOBJS = @LIBOBJS@
- LIBS = @LIBS@
+ LIBELF_CFLAGS = @LIBELF_CFLAGS@
+ LIBELF_LIBS = @LIBELF_LIBS@
+ LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c
index e2edc6938273..e2493d133990 100644
--- a/devel/glib20/files/extra-patch-glib_gunicollate.c
+++ b/devel/glib20/files/extra-patch-glib_gunicollate.c
@@ -1,5 +1,5 @@
---- glib/gunicollate.c.orig
-+++ glib/gunicollate.c
+--- glib/gunicollate.c.orig	2012-03-12 00:42:42.000000000 +0000
++++ glib/gunicollate.c	2012-09-27 15:11:08.000000000 +0000
 @@ -26,6 +26,10 @@
  #include <wchar.h>
  #endif
@@ -11,12 +11,7 @@
  #ifdef HAVE_CARBON
  #include <CoreServices/CoreServices.h>
  #endif
-@@ -36,10 +40,53 @@
- #include "gstring.h"
- #include "gstrfuncs.h"
- #include "gtestutils.h"
-+#include "gthread.h"
- #ifndef __STDC_ISO_10646__
+@@ -41,6 +45,48 @@
  #include "gconvert.h"
  #endif
  
@@ -34,7 +29,7 @@
 +
 +      icu_collator = ucol_open(NULL, &error);
 +      if (icu_collator == NULL)
-+	g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
++      g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
 +
 +      icu_collator_initialized = TRUE;
 +    }
@@ -54,10 +49,10 @@
 +      result = g_new(UChar, *result_len);
 +      u_strFromUTF8(result, *result_len, NULL, str, len, &error);
 +      if (error > U_ZERO_ERROR)
-+	{
-+	  g_free(result);
-+	  result = NULL;
-+	}
++      {
++        g_free(result);
++        result = NULL;
++      }
 +    }
 +
 +  return result;
@@ -65,7 +60,7 @@
  
  #ifdef _MSC_VER
  /* Workaround for bug in MSVCR80.DLL */
-@@ -127,6 +174,28 @@
+@@ -128,6 +174,28 @@
    g_return_val_if_fail (str1 != NULL, 0);
    g_return_val_if_fail (str2 != NULL, 0);
  
@@ -94,7 +89,7 @@
    str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
    str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
  
-@@ -419,6 +488,26 @@
+@@ -420,6 +488,26 @@
  
    g_return_val_if_fail (str != NULL, NULL);
  
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index c3e6c139b0e8..9c9caf0ab20c 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	2011-06-06 01:24:53.000000000 +0200
-+++ configure	2012-12-12 11:23:28.000000000 +0100
-@@ -583,6 +583,9 @@
+--- configure.orig	2013-02-14 19:12:15.000000000 +0000
++++ configure	2013-02-14 19:13:51.000000000 +0000
+@@ -603,6 +603,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
@@ -10,7 +10,7 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -5194,7 +5197,7 @@
+@@ -5602,7 +5605,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,21 +19,25 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -23077,7 +23080,7 @@
+@@ -23647,7 +23650,7 @@
  fi
  done
  
--for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -28271,7 +28274,7 @@
- fi
- 
- 
--if test "x${enable_Bsymbolic}" == "xyes"; then
-+if test "x${enable_Bsymbolic}" = "xyes"; then
-   GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions
- fi
- 
+@@ -27108,10 +27111,10 @@
+ #  b) FreeBSD doesn't do this either.
+ #
+ case $host in
+-  *-*-freebsd*|*-*-linux*)
++  *-*-linux*)
+     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`"
+     ;;
+-  *-*-openbsd*)
++  *-*-freebsd*|*-*-openbsd*)
+     LDFLAGS="$LDFLAGS -pthread"
+     ;;
+   *)
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
deleted file mode 100644
index 289bc3381903..000000000000
--- a/devel/glib20/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2010-08-08 12:14:27.000000000 +0200
-+++ Makefile.in	2010-08-08 12:15:40.000000000 +0200
-@@ -418,7 +418,7 @@
- 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
- TEST_PROGS = 
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
- DIST_SUBDIRS = $(SUBDIRS) build
- bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
diff --git a/devel/glib20/files/patch-gio_fam_Makefile.in b/devel/glib20/files/patch-gio_fam_Makefile.in
new file mode 100644
index 000000000000..033ff3f5dcda
--- /dev/null
+++ b/devel/glib20/files/patch-gio_fam_Makefile.in
@@ -0,0 +1,35 @@
+--- gio/fam/Makefile.in.orig	2012-03-07 21:07:42.000000000 +0100
++++ gio/fam/Makefile.in	2012-03-07 21:08:30.000000000 +0100
+@@ -87,9 +87,7 @@
+ am__installdirs = "$(DESTDIR)$(giomoduledir)"
+ LTLIBRARIES = $(giomodule_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-libgiofam_la_DEPENDENCIES = $(top_builddir)/gio/libgio-2.0.la \
+-	$(top_builddir)/gobject/libgobject-2.0.la \
+-	$(top_builddir)/glib/libglib-2.0.la $(am__DEPENDENCIES_1) \
++libgiofam_la_DEPENDENCIES =  \
+ 	$(am__DEPENDENCIES_1)
+ am__objects_1 =
+ am_libgiofam_la_OBJECTS = libgiofam_la-fam-helper.lo \
+@@ -402,9 +400,9 @@
+ 
+ libgiofam_la_LDFLAGS = $(module_flags)
+ libgiofam_la_LIBADD = \
+-		$(top_builddir)/gio/libgio-2.0.la \
+-		$(top_builddir)/gobject/libgobject-2.0.la \
+-		$(top_builddir)/glib/libglib-2.0.la \
++		-lgio-2.0 \
++		-lgobject-2.0 \
++		-lglib-2.0 \
+ 		$(GLIB_LIBS) \
+ 		$(FAM_LIBS) \
+ 		$(NULL)
+@@ -843,7 +841,7 @@
+ 
+ install-data-hook:
+ 	if $(RUN_QUERY_MODULES) && test -z "$(DESTDIR)" ; then					\
+-		$(top_builddir)/gio/gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
++		gio-querymodules$(EXEEXT) $(DESTDIR)$(GIO_MODULE_DIR) ;	\
+ 	fi
+ 
+ uninstall-local:
diff --git a/devel/glib20/files/patch-gio_gdesktopappinfo.c b/devel/glib20/files/patch-gio_gdesktopappinfo.c
deleted file mode 100644
index 73283b44dbab..000000000000
--- a/devel/glib20/files/patch-gio_gdesktopappinfo.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- gio/gdesktopappinfo.c.orig	2011-09-25 11:41:14.000000000 -0400
-+++ gio/gdesktopappinfo.c	2011-09-25 11:41:18.000000000 -0400
-@@ -1515,18 +1515,29 @@ update_mimeapps_list (const char  *deskt
-            */
-           if (!explicit_default)
-             {
--              system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, NULL);
-+              char *user_default;
-+              /* The system default can be in the list, don't exclude it */
-+              system_list = get_all_desktop_entries_for_mime_type (content_type, NULL, FALSE, &user_default);
- 
--              if (system_list != NULL)
-+              string = NULL;
-+              if (user_default != NULL)
-+                {
-+                  /* There is an existing default set in a lower priority defaults file, re-use it */
-+                  string = user_default;
-+                }
-+              else if (system_list != NULL)
-                 {
-                   string = system_list->data;
--
-+                }
-+              if (string)
-+                {
-                   g_key_file_set_string (key_file,
-                                          DEFAULT_APPLICATIONS_GROUP,
-                                          content_types[k],
-                                          string);
-                 }
- 
-+              g_free (user_default);
-               g_list_free_full (system_list, g_free);
-             }
-         }
diff --git a/devel/glib20/files/patch-gio_glib-compile-schemas.c b/devel/glib20/files/patch-gio_glib-compile-schemas.c
new file mode 100644
index 000000000000..e92fac5baff8
--- /dev/null
+++ b/devel/glib20/files/patch-gio_glib-compile-schemas.c
@@ -0,0 +1,16 @@
+--- gio/glib-compile-schemas.c.orig	2012-06-14 16:39:22.000000000 +0200
++++ gio/glib-compile-schemas.c	2012-06-14 16:39:55.000000000 +0200
+@@ -1204,11 +1204,13 @@
+       return;
+     }
+ 
++#if 0
+   if (path && (g_str_has_prefix (path, "/apps/") ||
+                g_str_has_prefix (path, "/desktop/") ||
+                g_str_has_prefix (path, "/system/")))
+     g_printerr ("warning: Schema '%s' has path '%s'.  Paths starting with "
+                 "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
++#endif
+ 
+   state->schema_state = schema_state_new (path, gettext_domain,
+                                           extends, extends_name, list_of);
diff --git a/devel/glib20/files/patch-gio_gunixcredentialsmessage.c b/devel/glib20/files/patch-gio_gunixcredentialsmessage.c
deleted file mode 100644
index b81a6e282aa8..000000000000
--- a/devel/glib20/files/patch-gio_gunixcredentialsmessage.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- gio/gunixcredentialsmessage.c.orig	2011-09-25 11:42:09.000000000 -0400
-+++ gio/gunixcredentialsmessage.c	2011-09-25 11:42:22.000000000 -0400
-@@ -162,11 +162,11 @@ g_unix_credentials_message_deserialize (
-       {
-         goto out;
-       }
--    if (size < CMSG_LEN (sizeof *cred))
-+    if (size < sizeof *cred)
-       {
-         g_warning ("Expected a struct cmsgcred (%" G_GSIZE_FORMAT " bytes) but "
-                    "got %" G_GSIZE_FORMAT " bytes of data",
--                   CMSG_LEN (sizeof *cred),
-+                   sizeof *cred,
-                    size);
-         goto out;
-       }
diff --git a/devel/glib20/files/patch-gio_gunixmount.c b/devel/glib20/files/patch-gio_gunixmount.c
index b9bfe143ed0c..e0b3caa374e2 100644
--- a/devel/glib20/files/patch-gio_gunixmount.c
+++ b/devel/glib20/files/patch-gio_gunixmount.c
@@ -1,6 +1,6 @@
---- gio/gunixmount.c.orig	2007-12-23 15:53:50.000000000 -0500
-+++ gio/gunixmount.c	2007-12-23 15:52:52.000000000 -0500
-@@ -372,12 +372,18 @@ g_unix_mount_eject (GMount             *
+--- gio/gunixmount.c.orig	2011-08-31 19:47:35.000000000 +0200
++++ gio/gunixmount.c	2011-09-15 17:50:24.000000000 +0200
+@@ -449,12 +449,18 @@ g_unix_mount_eject (GMount             *
                      gpointer             user_data)
  {
    GUnixMount *unix_mount = G_UNIX_MOUNT (mount);
@@ -17,5 +17,5 @@
 +  argv[2] = unix_mount->device_path;
 +#endif
  
-   return eject_unmount_do (mount, cancellable, callback, user_data, argv);
+   eject_unmount_do (mount, cancellable, callback, user_data, argv);
  }
diff --git a/devel/glib20/files/patch-gio_gunixmounts.c b/devel/glib20/files/patch-gio_gunixmounts.c
index f99358ddf2ec..608bd95a3072 100644
--- a/devel/glib20/files/patch-gio_gunixmounts.c
+++ b/devel/glib20/files/patch-gio_gunixmounts.c
@@ -1,16 +1,16 @@
---- gio/gunixmounts.c.orig	2011-06-05 19:18:49.000000000 -0400
-+++ gio/gunixmounts.c	2011-11-09 04:20:49.000000000 -0500
-@@ -135,6 +135,9 @@ struct _GUnixMountMonitor {
- 
+--- gio/gunixmounts.c.orig	2012-05-02 22:02:54.000000000 -0500
++++ gio/gunixmounts.c	2012-05-02 22:15:35.000000000 -0500
+@@ -155,6 +155,9 @@
    GFileMonitor *fstab_monitor;
    GFileMonitor *mtab_monitor;
-+
+ 
 +  guint mount_poller_source;
 +  GList *mount_poller_mounts;
++
+   GSource *proc_mounts_watch_source;
  };
  
- struct _GUnixMountMonitorClass {
-@@ -146,6 +149,8 @@ static GUnixMountMonitor *the_mount_moni
+@@ -167,6 +170,8 @@
  static GList *_g_get_unix_mounts (void);
  static GList *_g_get_unix_mount_points (void);
  
@@ -19,15 +19,15 @@
  G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT);
  
  #define MOUNT_POLL_INTERVAL 4000
-@@ -172,6 +177,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix
+@@ -193,6 +198,7 @@
  #endif
  
- #if defined(HAVE_GETMNTINFO) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
+ #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
 +#include <sys/param.h>
  #include <sys/ucred.h>
  #include <sys/mount.h>
  #include <fstab.h>
-@@ -222,20 +228,28 @@ g_unix_is_mount_path_system_internal (co
+@@ -243,22 +249,29 @@
      "/",              /* we already have "Filesystem root" in Nautilus */ 
      "/bin",
      "/boot",
@@ -39,6 +39,8 @@
      "/lib",
      "/lib64",
 +    "/libexec",
+     "/live/cow",
+     "/live/image",
      "/media",
      "/mnt",
      "/opt",
@@ -48,15 +50,14 @@
      "/srv",
      "/tmp",
      "/usr",
-+    "/usr/X11R6",
      "/usr/local",
 +    "/usr/obj",
 +    "/usr/ports",
 +    "/usr/src",
      "/var",
-     "/var/log/audit", /* https://bugzilla.redhat.com/show_bug.cgi?id=333041 */
-     "/var/tmp",       /* https://bugzilla.redhat.com/show_bug.cgi?id=335241 */
-@@ -271,6 +285,7 @@ guess_system_internal (const char *mount
+     "/var/crash",
+     "/var/local",
+@@ -299,6 +312,7 @@
      "devfs",
      "devpts",
      "ecryptfs",
@@ -64,7 +65,7 @@
      "kernfs",
      "linprocfs",
      "proc",
-@@ -1056,6 +1071,10 @@ get_mounts_timestamp (void)
+@@ -1122,6 +1136,10 @@
        if (stat (monitor_file, &buf) == 0)
  	return (guint64)buf.st_mtime;
      }
@@ -75,7 +76,7 @@
    return 0;
  }
  
-@@ -1198,6 +1217,13 @@ g_unix_mount_monitor_finalize (GObject *
+@@ -1267,6 +1285,13 @@
        g_object_unref (monitor->mtab_monitor);
      }
  
@@ -89,11 +90,10 @@
    the_mount_monitor = NULL;
  
    G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object);
-@@ -1278,6 +1304,51 @@ mtab_file_changed (GFileMonitor      *mo
-   g_signal_emit (mount_monitor, signals[MOUNTS_CHANGED], 0);
+@@ -1348,6 +1373,52 @@
  }
  
-+static gboolean
+ static gboolean
 +mount_change_poller (gpointer user_data)
 +{
 +  GUnixMountMonitor *mount_monitor;
@@ -115,15 +115,15 @@
 +      for (i = 0; i < g_list_length (current_mounts); i++)
 +        {
 +          GUnixMountEntry *m1;
-+	  GUnixMountEntry *m2;
++         GUnixMountEntry *m2;
 +
-+	  m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
-+	  m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
++         m1 = (GUnixMountEntry *)g_list_nth_data (current_mounts, i);
++         m2 = (GUnixMountEntry *)g_list_nth_data (mount_monitor->mount_poller_mounts, i);
 +          if (! has_changed && g_unix_mount_compare (m1, m2) != 0)
 +            has_changed = TRUE;
 +
-+	  g_unix_mount_free (m2);
-+	}
++         g_unix_mount_free (m2);
++       }
 +    }
 +
 +  g_list_free (mount_monitor->mount_poller_mounts);
@@ -138,12 +138,14 @@
 +  return TRUE;
 +}
 +
- static void
- g_unix_mount_monitor_init (GUnixMountMonitor *monitor)
- {
-@@ -1300,6 +1371,12 @@ g_unix_mount_monitor_init (GUnixMountMon
-       
-       g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
++
++static gboolean
+ proc_mounts_changed (GIOChannel   *channel,
+                      GIOCondition  cond,
+                      gpointer      user_data)
+@@ -1412,6 +1483,12 @@
+           g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor);
+         }
      }
 +  else
 +    {
diff --git a/devel/glib20/files/patch-gio_libasyncns_asyncns.c b/devel/glib20/files/patch-gio_libasyncns_asyncns.c
deleted file mode 100644
index 966dd27a689b..000000000000
--- a/devel/glib20/files/patch-gio_libasyncns_asyncns.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gio/libasyncns/asyncns.c.orig	2009-05-05 15:25:10.000000000 -0400
-+++ gio/libasyncns/asyncns.c	2009-05-05 15:25:51.000000000 -0400
-@@ -35,6 +35,8 @@
- #include <errno.h>
- #include <sys/wait.h>
- #include <sys/types.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
- #include <pwd.h>
- #include <netinet/in.h>
- #include <arpa/nameser.h>
diff --git a/devel/glib20/files/patch-gio_tests_include.c b/devel/glib20/files/patch-gio_tests_include.c
new file mode 100644
index 000000000000..165c97b386e5
--- /dev/null
+++ b/devel/glib20/files/patch-gio_tests_include.c
@@ -0,0 +1,10 @@
+--- glib/tests/include.c.orig	2012-03-06 12:11:39.000000000 +0100
++++ glib/tests/include.c	2012-03-06 12:13:17.000000000 +0100
+@@ -3,6 +3,7 @@
+ #define _POSIX_C_SOURCE 0
+ #undef _GNU_SOURCE
+ #undef _XOPEN_SOURCE
++#include <sys/types.h>
+ #include <pthread.h>
+ #include <glib.h>
+ 
diff --git a/devel/glib20/files/patch-glib-2.0.pc.in b/devel/glib20/files/patch-glib-2.0.pc.in
index f714b6f6eb02..9bd74ad4394e 100644
--- a/devel/glib20/files/patch-glib-2.0.pc.in
+++ b/devel/glib20/files/patch-glib-2.0.pc.in
@@ -1,8 +1,8 @@
---- glib-2.0.pc.in.orig	2011-01-06 07:29:30.000000000 +0000
-+++ glib-2.0.pc.in	2011-01-06 07:29:41.000000000 +0000
-@@ -12,4 +12,4 @@
- Version: @VERSION@
+--- glib-2.0.pc.in.orig	2012-01-16 04:12:06.000000000 +0100
++++ glib-2.0.pc.in	2012-03-06 12:30:11.000000000 +0100
+@@ -13,4 +13,4 @@
+ Requires.private: @PCRE_REQUIRES@
  Libs: -L${libdir} -lglib-2.0 @INTLLIBS@
- Libs.private: @ICONV_LIBS@
+ Libs.private: @G_THREAD_LIBS@ @G_LIBS_EXTRA@ @PCRE_LIBS@ @INTLLIBS@ @ICONV_LIBS@
 -Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@
 +Cflags: -I${includedir}/glib-2.0 @GLIB_EXTRA_CFLAGS@
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index d58efb723f81..30d6f1be8f8e 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,30 +1,30 @@
---- glib/Makefile.in.orig	2010-08-08 12:46:01.000000000 +0200
-+++ glib/Makefile.in	2010-08-08 12:46:01.000000000 +0200
-@@ -529,7 +529,7 @@ BUILT_SOURCES = glibconfig-stamp $(am__a
+--- glib/Makefile.in.orig	2012-09-24 01:59:13.000000000 +0000
++++ glib/Makefile.in	2012-09-24 02:02:07.000000000 +0000
+@@ -585,7 +585,7 @@
  #
  DISTCLEANFILES = glibconfig-stamp glibconfig.h
- CLEANFILES = $(am__append_2)
+ CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6)
 -configexecincludedir = $(libdir)/glib-2.0/include
 +configexecincludedir = $(includedir)/glib-2.0
  nodist_configexecinclude_HEADERS = glibconfig.h
  @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
  @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
-@@ -1530,7 +1530,7 @@ info: info-recursive
- 
+@@ -1617,7 +1617,7 @@
  info-am:
  
--install-data-am: install-data-local install-dist_gdbSCRIPTS \
-+install-data-am: install-data-local \
- 	install-glibincludeHEADERS install-glibsubincludeHEADERS \
- 	install-tapsetDATA
+ install-data-am: install-data-local install-deprecatedincludeHEADERS \
+-	install-dist_gdbSCRIPTS install-glibincludeHEADERS \
++	install-glibincludeHEADERS \
+ 	install-glibsubincludeHEADERS install-tapsetDATA
  	@$(NORMAL_INSTALL)
-@@ -1786,9 +1786,7 @@ distclean-local:
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -1906,9 +1906,7 @@
  libglib-gdb.py: libglib-gdb.py.in
- 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > libglib-gdb.py
+ 	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
  
 -install-data-hook: libglib-gdb.py
 -	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)
--	$(INSTALL) libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+-	$(INSTALL) $(builddir)/libglib-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load$(ABS_GLIB_RUNTIME_LIBDIR)/libglib-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
 +install-data-hook:
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libglib-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-glib_deprecated_gthread.h b/devel/glib20/files/patch-glib_deprecated_gthread.h
new file mode 100644
index 000000000000..889976f1fca9
--- /dev/null
+++ b/devel/glib20/files/patch-glib_deprecated_gthread.h
@@ -0,0 +1,10 @@
+--- ./glib/deprecated/gthread.h.orig	2012-05-27 17:07:04.000000000 +0200
++++ ./glib/deprecated/gthread.h	2012-05-27 17:07:19.000000000 +0200
+@@ -120,6 +120,7 @@
+                                 gpointer          user_data);
+ 
+ #ifndef G_OS_WIN32
++#include <sys/types.h>
+ #include <pthread.h>
+ #endif
+ 
diff --git a/devel/glib20/files/patch-glib_fix_hidden b/devel/glib20/files/patch-glib_fix_hidden
index c26942a39fb1..813c49808fc2 100644
--- a/devel/glib20/files/patch-glib_fix_hidden
+++ b/devel/glib20/files/patch-glib_fix_hidden
@@ -1,14 +1,3 @@
---- glib/gatomic-gcc.c.orig	2011-06-06 01:18:49.000000000 +0200
-+++ glib/gatomic-gcc.c	2011-12-07 00:24:48.000000000 +0100
-@@ -22,6 +22,8 @@
- 
- #include "gatomic.h"
- 
-+#include "gthreadprivate.h"
-+
- gint
- g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
- 			       gint           val)
 --- glib/gmem.c.orig	2011-02-10 00:31:42.000000000 +0100
 +++ glib/gmem.c	2011-12-07 00:21:38.000000000 +0100
 @@ -39,6 +39,7 @@
diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c
deleted file mode 100644
index ef7f0a87b9ff..000000000000
--- a/devel/glib20/files/patch-glib_gregex.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- glib/gregex.c.orig	2007-09-09 18:35:32.000000000 -0400
-+++ glib/gregex.c	2007-09-09 18:36:05.000000000 -0400
-@@ -164,8 +164,10 @@ match_error (gint errcode)
-     case PCRE_ERROR_DFA_RECURSE:
-     case PCRE_ERROR_RECURSIONLIMIT:
-       return _("recursion limit reached");
-+#ifdef PCRE_ERROR_NULLWSLIMIT
-     case PCRE_ERROR_NULLWSLIMIT:
-       return _("workspace limit for empty substrings reached");
-+#endif
-     case PCRE_ERROR_BADNEWLINE:
-       return _("invalid combination of newline flags");
-     default:
diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c
new file mode 100644
index 000000000000..f19007f8c636
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gthread-posix.c
@@ -0,0 +1,20 @@
+--- glib/gthread-posix.c.orig	2012-11-10 03:24:06.000000000 +0000
++++ glib/gthread-posix.c	2012-11-12 18:06:36.000000000 +0000
+@@ -89,7 +89,7 @@
+   if G_UNLIKELY (mutex == NULL)
+     g_thread_abort (errno, "malloc");
+ 
+-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP
++#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__)
+   {
+     pthread_mutexattr_t attr;
+     pthread_mutexattr_init (&attr);
+@@ -101,7 +101,7 @@
+   if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0)
+     g_thread_abort (status, "pthread_mutex_init");
+ 
+-#ifdef PTHREAD_ADAPTIVE_MUTEX_NP
++#if defined(PTHREAD_ADAPTIVE_MUTEX_NP) && !defined(__FreeBSD__)
+   pthread_mutexattr_destroy (&attr);
+ #endif
+ 
diff --git a/devel/glib20/files/patch-glib_tests_gdatetime.c b/devel/glib20/files/patch-glib_tests_gdatetime.c
new file mode 100644
index 000000000000..8a8774254f95
--- /dev/null
+++ b/devel/glib20/files/patch-glib_tests_gdatetime.c
@@ -0,0 +1,20 @@
+--- glib/tests/gdatetime.c.orig	2012-08-17 00:06:25.000000000 +0000
++++ glib/tests/gdatetime.c	2012-10-23 12:38:55.000000000 +0000
+@@ -1230,7 +1230,7 @@
+   gint64 u;
+   gint i1, i2;
+ 
+-  tz = g_time_zone_new ("Canada/Eastern");
++  tz = g_time_zone_new ("America/Montreal");
+   dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0);
+   u = g_date_time_to_unix (dt);
+ 
+@@ -1259,7 +1259,7 @@
+   gint64 u, u2;
+   gint i1, i2;
+ 
+-  tz = g_time_zone_new ("Canada/Eastern");
++  tz = g_time_zone_new ("America/Montreal");
+   dt = g_date_time_new_utc (2010, 11, 7, 1, 30, 0);
+   u = g_date_time_to_unix (dt);
+   u2 = u;
diff --git a/devel/glib20/files/patch-glib_tests_utils.c b/devel/glib20/files/patch-glib_tests_utils.c
new file mode 100644
index 000000000000..0f7544cc4bff
--- /dev/null
+++ b/devel/glib20/files/patch-glib_tests_utils.c
@@ -0,0 +1,11 @@
+--- glib/tests/utils.c.orig	2012-09-24 02:19:54.000000000 +0000
++++ glib/tests/utils.c	2012-09-24 02:20:48.000000000 +0000
+@@ -416,7 +416,7 @@
+ 
+   xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS");
+   if (!xdg)
+-    xdg = "/etc/xdg";
++    xdg = "/usr/local/etc/xdg:/etc/xdg";
+ 
+   dirs = g_get_system_config_dirs ();
+ 
diff --git a/devel/glib20/files/patch-gobject_Makefile.in b/devel/glib20/files/patch-gobject_Makefile.in
index 12a20215a0bb..f99ec4a97002 100644
--- a/devel/glib20/files/patch-gobject_Makefile.in
+++ b/devel/glib20/files/patch-gobject_Makefile.in
@@ -1,6 +1,6 @@
---- gobject/Makefile.in.orig	2010-06-08 09:19:51.000000000 +0200
-+++ gobject/Makefile.in	2010-06-08 09:20:41.000000000 +0200
-@@ -1236,7 +1236,7 @@ info: info-recursive
+--- gobject/Makefile.in.orig	2012-05-03 11:42:11.000000000 +0200
++++ gobject/Makefile.in	2012-05-03 11:42:51.000000000 +0200
+@@ -1381,7 +1381,7 @@
  
  info-am:
  
@@ -9,13 +9,13 @@
  	install-libgobjectincludeHEADERS install-tapsetDATA
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1460,9 +1460,7 @@ libgobject-gdb.py: libgobject-gdb.py.in
+@@ -1649,9 +1649,7 @@
  uninstall-gdb:
  	-rm -r $(DESTDIR)$(datadir)/gdb
  
 -install-data-hook: libgobject-gdb.py
 -	mkdir -p $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)
--	$(INSTALL) libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
+-	$(INSTALL) $(builddir)/libgobject-gdb.py $(DESTDIR)$(datadir)/gdb/auto-load/$(ABS_GLIB_RUNTIME_LIBDIR)/libgobject-2.0.so.0.$(LT_CURRENT).$(LT_REVISION)-gdb.py
 +install-data-hook:
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mkdir -p $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
  @HAVE_GLIB_RUNTIME_LIBDIR_TRUE@	mv $(DESTDIR)$(libdir)/libgobject-2.0.so.0 $(DESTDIR)$(libdir)/$(GLIB_RUNTIME_LIBDIR)
diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c
deleted file mode 100644
index 47c5ab8f1591..000000000000
--- a/devel/glib20/files/patch-gthread_gthread-posix.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- gthread/gthread-posix.c.orig	Mon Nov  1 13:47:12 2004
-+++ gthread/gthread-posix.c	Wed Mar  9 14:21:20 2005
-@@ -125,7 +129,8 @@
- g_thread_impl_init(void)
- {
- #ifdef _SC_THREAD_STACK_MIN
--  g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN), 0);
-+  g_thread_min_stack_size = MAX (sysconf (_SC_THREAD_STACK_MIN),
-+    g_thread_min_stack_size);
- #endif /* _SC_THREAD_STACK_MIN */
- #ifdef HAVE_PRIORITIES
- # ifdef G_THREADS_IMPL_POSIX
-@@ -176,7 +181,7 @@
-   result = pthread_mutex_trylock ((pthread_mutex_t *) mutex);
- 
- #ifdef G_THREADS_IMPL_POSIX
--  if (result == EBUSY)
-+  if ((result == EBUSY) || (result == EDEADLK))
-     return FALSE;
- #else /* G_THREADS_IMPL_DCE */
-   if (result == 0)
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index e3b7ff0f2eaa..fe7f895a6c81 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,15 +1,19 @@
 bin/gdbus
+bin/gdbus-codegen
 bin/gio-querymodules
+bin/glib-compile-resources
 bin/glib-compile-schemas
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query
+bin/gresource
 bin/gsettings
 bin/gtester
 bin/gtester-report
-etc/bash_completion.d/gdbus-bash-completion.sh
-etc/bash_completion.d/gsettings-bash-completion.sh
+share/bash-completion/completions/gdbus
+share/bash-completion/completions/gsettings
+share/bash-completion/completions/gresource
 include/gio-unix-2.0/gio/gdesktopappinfo.h
 include/gio-unix-2.0/gio/gfiledescriptorbased.h
 include/gio-unix-2.0/gio/gunixconnection.h
@@ -22,6 +26,8 @@ include/gio-unix-2.0/gio/gunixoutputstream.h
 include/gio-unix-2.0/gio/gunixsocketaddress.h
 include/glib-2.0/gio/gaction.h
 include/glib-2.0/gio/gactiongroup.h
+include/glib-2.0/gio/gactiongroupexporter.h
+include/glib-2.0/gio/gactionmap.h
 include/glib-2.0/gio/gappinfo.h
 include/glib-2.0/gio/gapplication.h
 include/glib-2.0/gio/gapplicationcommandline.h
@@ -38,15 +44,25 @@ include/glib-2.0/gio/gconverteroutputstream.h
 include/glib-2.0/gio/gcredentials.h
 include/glib-2.0/gio/gdatainputstream.h
 include/glib-2.0/gio/gdataoutputstream.h
+include/glib-2.0/gio/gdbusactiongroup.h
 include/glib-2.0/gio/gdbusaddress.h
 include/glib-2.0/gio/gdbusauthobserver.h
 include/glib-2.0/gio/gdbusconnection.h
 include/glib-2.0/gio/gdbuserror.h
+include/glib-2.0/gio/gdbusinterface.h
+include/glib-2.0/gio/gdbusinterfaceskeleton.h
 include/glib-2.0/gio/gdbusintrospection.h
+include/glib-2.0/gio/gdbusmenumodel.h
 include/glib-2.0/gio/gdbusmessage.h
 include/glib-2.0/gio/gdbusmethodinvocation.h
 include/glib-2.0/gio/gdbusnameowning.h
 include/glib-2.0/gio/gdbusnamewatching.h
+include/glib-2.0/gio/gdbusobject.h
+include/glib-2.0/gio/gdbusobjectmanager.h
+include/glib-2.0/gio/gdbusobjectmanagerclient.h
+include/glib-2.0/gio/gdbusobjectmanagerserver.h
+include/glib-2.0/gio/gdbusobjectproxy.h
+include/glib-2.0/gio/gdbusobjectskeleton.h
 include/glib-2.0/gio/gdbusproxy.h
 include/glib-2.0/gio/gdbusserver.h
 include/glib-2.0/gio/gdbusutils.h
@@ -67,6 +83,7 @@ include/glib-2.0/gio/gfilterinputstream.h
 include/glib-2.0/gio/gfilteroutputstream.h
 include/glib-2.0/gio/gicon.h
 include/glib-2.0/gio/ginetaddress.h
+include/glib-2.0/gio/ginetaddressmask.h
 include/glib-2.0/gio/ginetsocketaddress.h
 include/glib-2.0/gio/ginitable.h
 include/glib-2.0/gio/ginputstream.h
@@ -81,25 +98,33 @@ include/glib-2.0/gio/giotypes.h
 include/glib-2.0/gio/gloadableicon.h
 include/glib-2.0/gio/gmemoryinputstream.h
 include/glib-2.0/gio/gmemoryoutputstream.h
+include/glib-2.0/gio/gmenu.h
+include/glib-2.0/gio/gmenuexporter.h
+include/glib-2.0/gio/gmenumodel.h
 include/glib-2.0/gio/gmount.h
 include/glib-2.0/gio/gmountoperation.h
 include/glib-2.0/gio/gnativevolumemonitor.h
 include/glib-2.0/gio/gnetworkaddress.h
+include/glib-2.0/gio/gnetworkmonitor.h
 include/glib-2.0/gio/gnetworkservice.h
 include/glib-2.0/gio/goutputstream.h
 include/glib-2.0/gio/gpermission.h
 include/glib-2.0/gio/gpollableinputstream.h
 include/glib-2.0/gio/gpollableoutputstream.h
+include/glib-2.0/gio/gpollableutils.h
 include/glib-2.0/gio/gproxy.h
 include/glib-2.0/gio/gproxyaddress.h
 include/glib-2.0/gio/gproxyaddressenumerator.h
 include/glib-2.0/gio/gproxyresolver.h
-include/glib-2.0/gio/gsimpleaction.h
-include/glib-2.0/gio/gsimpleactiongroup.h
+include/glib-2.0/gio/gremoteactiongroup.h
 include/glib-2.0/gio/gresolver.h
+include/glib-2.0/gio/gresource.h
 include/glib-2.0/gio/gseekable.h
 include/glib-2.0/gio/gsettings.h
 include/glib-2.0/gio/gsettingsbackend.h
+include/glib-2.0/gio/gsettingsschema.h
+include/glib-2.0/gio/gsimpleaction.h
+include/glib-2.0/gio/gsimpleactiongroup.h
 include/glib-2.0/gio/gsimpleasyncresult.h
 include/glib-2.0/gio/gsimplepermission.h
 include/glib-2.0/gio/gsocket.h
@@ -114,12 +139,17 @@ include/glib-2.0/gio/gsocketservice.h
 include/glib-2.0/gio/gsrvtarget.h
 include/glib-2.0/gio/gtcpconnection.h
 include/glib-2.0/gio/gtcpwrapperconnection.h
+include/glib-2.0/gio/gtestdbus.h
 include/glib-2.0/gio/gthemedicon.h
 include/glib-2.0/gio/gthreadedsocketservice.h
 include/glib-2.0/gio/gtlsbackend.h
 include/glib-2.0/gio/gtlscertificate.h
 include/glib-2.0/gio/gtlsclientconnection.h
 include/glib-2.0/gio/gtlsconnection.h
+include/glib-2.0/gio/gtlsdatabase.h
+include/glib-2.0/gio/gtlsfiledatabase.h
+include/glib-2.0/gio/gtlsinteraction.h
+include/glib-2.0/gio/gtlspassword.h
 include/glib-2.0/gio/gtlsserverconnection.h
 include/glib-2.0/gio/gvfs.h
 include/glib-2.0/gio/gvolume.h
@@ -127,7 +157,14 @@ include/glib-2.0/gio/gvolumemonitor.h
 include/glib-2.0/gio/gzlibcompressor.h
 include/glib-2.0/gio/gzlibdecompressor.h
 include/glib-2.0/glib-object.h
+include/glib-2.0/glib-unix.h
 include/glib-2.0/glib.h
+include/glib-2.0/glib/deprecated/gallocator.h
+include/glib-2.0/glib/deprecated/gcache.h
+include/glib-2.0/glib/deprecated/gcompletion.h
+include/glib-2.0/glib/deprecated/gmain.h
+include/glib-2.0/glib/deprecated/grel.h
+include/glib-2.0/glib/deprecated/gthread.h
 include/glib-2.0/glib/galloca.h
 include/glib-2.0/glib/garray.h
 include/glib-2.0/glib/gasyncqueue.h
@@ -136,17 +173,20 @@ include/glib-2.0/glib/gbacktrace.h
 include/glib-2.0/glib/gbase64.h
 include/glib-2.0/glib/gbitlock.h
 include/glib-2.0/glib/gbookmarkfile.h
-include/glib-2.0/glib/gcache.h
+include/glib-2.0/glib/gbytes.h
+include/glib-2.0/glib/gcharset.h
 include/glib-2.0/glib/gchecksum.h
-include/glib-2.0/glib/gcompletion.h
 include/glib-2.0/glib/gconvert.h
 include/glib-2.0/glib/gdataset.h
 include/glib-2.0/glib/gdate.h
 include/glib-2.0/glib/gdatetime.h
 include/glib-2.0/glib/gdir.h
+include/glib-2.0/glib/genviron.h
 include/glib-2.0/glib/gerror.h
 include/glib-2.0/glib/gfileutils.h
+include/glib-2.0/glib/ggettext.h
 include/glib-2.0/glib/ghash.h
+include/glib-2.0/glib/ghmac.h
 include/glib-2.0/glib/ghook.h
 include/glib-2.0/glib/ghostutils.h
 include/glib-2.0/glib/gi18n-lib.h
@@ -171,7 +211,6 @@ include/glib-2.0/glib/gquark.h
 include/glib-2.0/glib/gqueue.h
 include/glib-2.0/glib/grand.h
 include/glib-2.0/glib/gregex.h
-include/glib-2.0/glib/grel.h
 include/glib-2.0/glib/gscanner.h
 include/glib-2.0/glib/gsequence.h
 include/glib-2.0/glib/gshell.h
@@ -181,11 +220,13 @@ include/glib-2.0/glib/gspawn.h
 include/glib-2.0/glib/gstdio.h
 include/glib-2.0/glib/gstrfuncs.h
 include/glib-2.0/glib/gstring.h
+include/glib-2.0/glib/gstringchunk.h
 include/glib-2.0/glib/gtestutils.h
 include/glib-2.0/glib/gthread.h
 include/glib-2.0/glib/gthreadpool.h
 include/glib-2.0/glib/gtimer.h
 include/glib-2.0/glib/gtimezone.h
+include/glib-2.0/glib/gtrashstack.h
 include/glib-2.0/glib/gtree.h
 include/glib-2.0/glib/gtypes.h
 include/glib-2.0/glib/gunicode.h
@@ -193,6 +234,8 @@ include/glib-2.0/glib/gurifuncs.h
 include/glib-2.0/glib/gutils.h
 include/glib-2.0/glib/gvariant.h
 include/glib-2.0/glib/gvarianttype.h
+include/glib-2.0/glib/gversion.h
+include/glib-2.0/glib/gversionmacros.h
 include/glib-2.0/glib/gwin32.h
 include/glib-2.0/glibconfig.h
 include/glib-2.0/gmodule.h
@@ -200,6 +243,7 @@ include/glib-2.0/gobject/gbinding.h
 include/glib-2.0/gobject/gboxed.h
 include/glib-2.0/gobject/gclosure.h
 include/glib-2.0/gobject/genums.h
+include/glib-2.0/gobject/glib-types.h
 include/glib-2.0/gobject/gmarshal.h
 include/glib-2.0/gobject/gobject.h
 include/glib-2.0/gobject/gobjectnotifyqueue.c
@@ -214,6 +258,30 @@ include/glib-2.0/gobject/gvalue.h
 include/glib-2.0/gobject/gvaluearray.h
 include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
+lib/gdbus-2.0/codegen/__init__.py
+lib/gdbus-2.0/codegen/__init__.pyc
+lib/gdbus-2.0/codegen/__init__.pyo
+lib/gdbus-2.0/codegen/codegen.py
+lib/gdbus-2.0/codegen/codegen.pyc
+lib/gdbus-2.0/codegen/codegen.pyo
+lib/gdbus-2.0/codegen/codegen_docbook.py
+lib/gdbus-2.0/codegen/codegen_docbook.pyc
+lib/gdbus-2.0/codegen/codegen_docbook.pyo
+lib/gdbus-2.0/codegen/codegen_main.py
+lib/gdbus-2.0/codegen/codegen_main.pyc
+lib/gdbus-2.0/codegen/codegen_main.pyo
+lib/gdbus-2.0/codegen/config.py
+lib/gdbus-2.0/codegen/config.pyc
+lib/gdbus-2.0/codegen/config.pyo
+lib/gdbus-2.0/codegen/dbustypes.py
+lib/gdbus-2.0/codegen/dbustypes.pyc
+lib/gdbus-2.0/codegen/dbustypes.pyo
+lib/gdbus-2.0/codegen/parser.py
+lib/gdbus-2.0/codegen/parser.pyc
+lib/gdbus-2.0/codegen/parser.pyo
+lib/gdbus-2.0/codegen/utils.py
+lib/gdbus-2.0/codegen/utils.pyc
+lib/gdbus-2.0/codegen/utils.pyo
 lib/libgio-2.0.a
 lib/libgio-2.0.la
 lib/libgio-2.0.so
@@ -268,9 +336,9 @@ share/locale/da/LC_MESSAGES/glib20.mo
 share/locale/de/LC_MESSAGES/glib20.mo
 share/locale/dz/LC_MESSAGES/glib20.mo
 share/locale/el/LC_MESSAGES/glib20.mo
+share/locale/en@shaw/LC_MESSAGES/glib20.mo
 share/locale/en_CA/LC_MESSAGES/glib20.mo
 share/locale/en_GB/LC_MESSAGES/glib20.mo
-share/locale/en@shaw/LC_MESSAGES/glib20.mo
 share/locale/eo/LC_MESSAGES/glib20.mo
 share/locale/es/LC_MESSAGES/glib20.mo
 share/locale/et/LC_MESSAGES/glib20.mo
@@ -342,26 +410,6 @@ share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
-@exec mkdir -p %D/share/glib-2.0/schemas
-@exec mkdir -p %D/share/GConf/gsettings
-@dirrm share/GConf/gsettings
-@dirrm share/GConf
-@exec glib-compile-schemas --uninstall %D/share/glib-2.0/schemas
-@dirrm share/glib-2.0/schemas
-@dirrm share/glib-2.0/gettext/po
-@dirrm share/glib-2.0/gettext
-@dirrm share/glib-2.0
-@exec mkdir -p %D/lib/gio/modules
-@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
-@unexec /bin/rm -f %D/lib/gio/modules/giomodule.cache
-@dirrmtry lib/gio/modules
-@dirrmtry lib/gio
-@dirrm include/glib-2.0/gobject
-@dirrm include/glib-2.0/glib
-@dirrm include/glib-2.0/gio
-@dirrm include/glib-2.0
-@dirrm include/gio-unix-2.0/gio
-@dirrm include/gio-unix-2.0
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/yi/LC_MESSAGES
@@ -416,4 +464,27 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrmtry etc/bash_completion.d
+@exec mkdir -p %D/share/glib-2.0/schemas
+@exec glib-compile-schemas %D/share/glib-2.0/schemas
+@dirrm share/glib-2.0/schemas
+@dirrm share/glib-2.0/gettext/po
+@dirrm share/glib-2.0/gettext
+@dirrm share/glib-2.0
+@dirrmtry share/bash-completion/completions
+@dirrmtry share/bash-completion
+@exec mkdir -p %D/share/GConf/gsettings
+@dirrm share/GConf/gsettings
+@dirrm share/GConf
+@exec mkdir -p %D/lib/gio/modules
+@exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
+@dirrmtry lib/gio/modules
+@dirrmtry lib/gio
+@dirrm lib/gdbus-2.0/codegen
+@dirrm lib/gdbus-2.0
+@dirrm include/glib-2.0/gobject
+@dirrm include/glib-2.0/glib/deprecated
+@dirrm include/glib-2.0/glib
+@dirrm include/glib-2.0/gio
+@dirrm include/glib-2.0
+@dirrm include/gio-unix-2.0/gio
+@dirrm include/gio-unix-2.0
diff --git a/devel/glibmm-reference/Makefile b/devel/glibmm-reference/Makefile
index 61a9d1acd86f..c06dd5521015 100644
--- a/devel/glibmm-reference/Makefile
+++ b/devel/glibmm-reference/Makefile
@@ -12,6 +12,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/glibmm-2.4.pc:${PORTSDIR}/devel/gl
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
 
 DOCSDIR=	${PREFIX}/share/doc/glibmm-2.4
 
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 367f961117f4..c1f48b20de6c 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:    glibmm
-# Date created:         		04 December 2003
-# Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
-#
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/glibmm/Makefile,v 1.114 2011/06/14 12:43:33 kwm Exp $
-#
+#   $MCom: ports/devel/glibmm/Makefile,v 1.121 2012/12/09 21:00:20 kwm Exp $
 
 PORTNAME=	glibmm
-PORTVERSION=	2.28.2
+PORTVERSION=	2.34.1
 PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
@@ -23,12 +19,12 @@ PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack glib20 ltverhack
+USE_GNOME=	gnomehack glib20 ltverhack libsigc++20
+USE_PKGCONFIG=	build
 USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 4b7ba74b55d3..99984514c4ba 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glibmm-2.28.2.tar.xz) = f84e99858d9674705316ec40cb3f03c34129293ebd370a7d63df6d959644cbe3
-SIZE (gnome2/glibmm-2.28.2.tar.xz) = 4584624
+SHA256 (gnome2/glibmm-2.34.1.tar.xz) = b425a52c7e178aeaaaffd02c5497bfd68d0cb8be56cef3620558a80dd5d692c4
+SIZE (gnome2/glibmm-2.34.1.tar.xz) = 5670736
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 2c3971ff9dda..ecfb362d7e39 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -1,23 +1,37 @@
 include/giomm-%%API_VERSION%%/giomm.h
+include/giomm-%%API_VERSION%%/giomm/action.h
+include/giomm-%%API_VERSION%%/giomm/actiongroup.h
+include/giomm-%%API_VERSION%%/giomm/actionmap.h
 include/giomm-%%API_VERSION%%/giomm/appinfo.h
+include/giomm-%%API_VERSION%%/giomm/applaunchcontext.h
+include/giomm-%%API_VERSION%%/giomm/application.h
+include/giomm-%%API_VERSION%%/giomm/applicationcommandline.h
 include/giomm-%%API_VERSION%%/giomm/asyncinitable.h
 include/giomm-%%API_VERSION%%/giomm/asyncresult.h
 include/giomm-%%API_VERSION%%/giomm/bufferedinputstream.h
 include/giomm-%%API_VERSION%%/giomm/bufferedoutputstream.h
 include/giomm-%%API_VERSION%%/giomm/cancellable.h
+include/giomm-%%API_VERSION%%/giomm/charsetconverter.h
 include/giomm-%%API_VERSION%%/giomm/contenttype.h
+include/giomm-%%API_VERSION%%/giomm/converter.h
+include/giomm-%%API_VERSION%%/giomm/converterinputstream.h
+include/giomm-%%API_VERSION%%/giomm/converteroutputstream.h
 include/giomm-%%API_VERSION%%/giomm/credentials.h
 include/giomm-%%API_VERSION%%/giomm/datainputstream.h
 include/giomm-%%API_VERSION%%/giomm/dataoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/dbusactiongroup.h
 include/giomm-%%API_VERSION%%/giomm/dbusaddress.h
 include/giomm-%%API_VERSION%%/giomm/dbusauthobserver.h
 include/giomm-%%API_VERSION%%/giomm/dbusconnection.h
 include/giomm-%%API_VERSION%%/giomm/dbuserror.h
 include/giomm-%%API_VERSION%%/giomm/dbuserrorutils.h
+include/giomm-%%API_VERSION%%/giomm/dbusinterface.h
 include/giomm-%%API_VERSION%%/giomm/dbusinterfacevtable.h
 include/giomm-%%API_VERSION%%/giomm/dbusintrospection.h
+include/giomm-%%API_VERSION%%/giomm/dbusmenumodel.h
 include/giomm-%%API_VERSION%%/giomm/dbusmessage.h
 include/giomm-%%API_VERSION%%/giomm/dbusmethodinvocation.h
+include/giomm-%%API_VERSION%%/giomm/dbusobject.h
 include/giomm-%%API_VERSION%%/giomm/dbusownname.h
 include/giomm-%%API_VERSION%%/giomm/dbusproxy.h
 include/giomm-%%API_VERSION%%/giomm/dbusserver.h
@@ -53,29 +67,50 @@ include/giomm-%%API_VERSION%%/giomm/iostream.h
 include/giomm-%%API_VERSION%%/giomm/loadableicon.h
 include/giomm-%%API_VERSION%%/giomm/memoryinputstream.h
 include/giomm-%%API_VERSION%%/giomm/memoryoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/menu.h
+include/giomm-%%API_VERSION%%/giomm/menuattributeiter.h
+include/giomm-%%API_VERSION%%/giomm/menuitem.h
+include/giomm-%%API_VERSION%%/giomm/menulinkiter.h
+include/giomm-%%API_VERSION%%/giomm/menumodel.h
 include/giomm-%%API_VERSION%%/giomm/mount.h
 include/giomm-%%API_VERSION%%/giomm/mountoperation.h
 include/giomm-%%API_VERSION%%/giomm/networkaddress.h
 include/giomm-%%API_VERSION%%/giomm/networkservice.h
 include/giomm-%%API_VERSION%%/giomm/outputstream.h
+include/giomm-%%API_VERSION%%/giomm/pollableinputstream.h
+include/giomm-%%API_VERSION%%/giomm/pollableoutputstream.h
+include/giomm-%%API_VERSION%%/giomm/private/action_p.h
+include/giomm-%%API_VERSION%%/giomm/private/actiongroup_p.h
+include/giomm-%%API_VERSION%%/giomm/private/actionmap_p.h
 include/giomm-%%API_VERSION%%/giomm/private/appinfo_p.h
+include/giomm-%%API_VERSION%%/giomm/private/applaunchcontext_p.h
+include/giomm-%%API_VERSION%%/giomm/private/application_p.h
+include/giomm-%%API_VERSION%%/giomm/private/applicationcommandline_p.h
 include/giomm-%%API_VERSION%%/giomm/private/asyncinitable_p.h
 include/giomm-%%API_VERSION%%/giomm/private/asyncresult_p.h
 include/giomm-%%API_VERSION%%/giomm/private/bufferedinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/bufferedoutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/cancellable_p.h
+include/giomm-%%API_VERSION%%/giomm/private/charsetconverter_p.h
+include/giomm-%%API_VERSION%%/giomm/private/converter_p.h
+include/giomm-%%API_VERSION%%/giomm/private/converterinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/converteroutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/credentials_p.h
 include/giomm-%%API_VERSION%%/giomm/private/datainputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dataoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusactiongroup_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusaddress_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusauthobserver_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusconnection_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbuserror_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbuserrorutils_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusinterface_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusinterfacevtable_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusintrospection_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusmenumodel_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusmessage_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusmethodinvocation_p.h
+include/giomm-%%API_VERSION%%/giomm/private/dbusobject_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusownname_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusproxy_p.h
 include/giomm-%%API_VERSION%%/giomm/private/dbusserver_p.h
@@ -110,17 +145,28 @@ include/giomm-%%API_VERSION%%/giomm/private/iostream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/loadableicon_p.h
 include/giomm-%%API_VERSION%%/giomm/private/memoryinputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/memoryoutputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/menu_p.h
+include/giomm-%%API_VERSION%%/giomm/private/menuattributeiter_p.h
+include/giomm-%%API_VERSION%%/giomm/private/menuitem_p.h
+include/giomm-%%API_VERSION%%/giomm/private/menulinkiter_p.h
+include/giomm-%%API_VERSION%%/giomm/private/menumodel_p.h
 include/giomm-%%API_VERSION%%/giomm/private/mount_p.h
 include/giomm-%%API_VERSION%%/giomm/private/mountoperation_p.h
 include/giomm-%%API_VERSION%%/giomm/private/networkaddress_p.h
 include/giomm-%%API_VERSION%%/giomm/private/networkservice_p.h
 include/giomm-%%API_VERSION%%/giomm/private/outputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/pollableinputstream_p.h
+include/giomm-%%API_VERSION%%/giomm/private/pollableoutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/proxy_p.h
 include/giomm-%%API_VERSION%%/giomm/private/proxyaddress_p.h
 include/giomm-%%API_VERSION%%/giomm/private/proxyresolver_p.h
+include/giomm-%%API_VERSION%%/giomm/private/remoteactiongroup_p.h
 include/giomm-%%API_VERSION%%/giomm/private/resolver_p.h
+include/giomm-%%API_VERSION%%/giomm/private/resource_p.h
 include/giomm-%%API_VERSION%%/giomm/private/seekable_p.h
 include/giomm-%%API_VERSION%%/giomm/private/settings_p.h
+include/giomm-%%API_VERSION%%/giomm/private/simpleaction_p.h
+include/giomm-%%API_VERSION%%/giomm/private/simpleactiongroup_p.h
 include/giomm-%%API_VERSION%%/giomm/private/socket_p.h
 include/giomm-%%API_VERSION%%/giomm/private/socketaddress_p.h
 include/giomm-%%API_VERSION%%/giomm/private/socketaddressenumerator_p.h
@@ -143,12 +189,18 @@ include/giomm-%%API_VERSION%%/giomm/private/unixoutputstream_p.h
 include/giomm-%%API_VERSION%%/giomm/private/unixsocketaddress_p.h
 include/giomm-%%API_VERSION%%/giomm/private/volume_p.h
 include/giomm-%%API_VERSION%%/giomm/private/volumemonitor_p.h
+include/giomm-%%API_VERSION%%/giomm/private/zlibcompressor_p.h
+include/giomm-%%API_VERSION%%/giomm/private/zlibdecompressor_p.h
 include/giomm-%%API_VERSION%%/giomm/proxy.h
 include/giomm-%%API_VERSION%%/giomm/proxyaddress.h
 include/giomm-%%API_VERSION%%/giomm/proxyresolver.h
+include/giomm-%%API_VERSION%%/giomm/remoteactiongroup.h
 include/giomm-%%API_VERSION%%/giomm/resolver.h
+include/giomm-%%API_VERSION%%/giomm/resource.h
 include/giomm-%%API_VERSION%%/giomm/seekable.h
 include/giomm-%%API_VERSION%%/giomm/settings.h
+include/giomm-%%API_VERSION%%/giomm/simpleaction.h
+include/giomm-%%API_VERSION%%/giomm/simpleactiongroup.h
 include/giomm-%%API_VERSION%%/giomm/socket.h
 include/giomm-%%API_VERSION%%/giomm/socketaddress.h
 include/giomm-%%API_VERSION%%/giomm/socketaddressenumerator.h
@@ -172,15 +224,19 @@ include/giomm-%%API_VERSION%%/giomm/unixsocketaddress.h
 include/giomm-%%API_VERSION%%/giomm/volume.h
 include/giomm-%%API_VERSION%%/giomm/volumemonitor.h
 include/giomm-%%API_VERSION%%/giomm/wrap_init.h
+include/giomm-%%API_VERSION%%/giomm/zlibcompressor.h
+include/giomm-%%API_VERSION%%/giomm/zlibdecompressor.h
 include/glibmm-%%API_VERSION%%/glibmm.h
 include/glibmm-%%API_VERSION%%/glibmm/arrayhandle.h
 include/glibmm-%%API_VERSION%%/glibmm/balancedtree.h
+include/glibmm-%%API_VERSION%%/glibmm/bytes.h
 include/glibmm-%%API_VERSION%%/glibmm/checksum.h
 include/glibmm-%%API_VERSION%%/glibmm/class.h
 include/glibmm-%%API_VERSION%%/glibmm/containerhandle_shared.h
 include/glibmm-%%API_VERSION%%/glibmm/containers.h
 include/glibmm-%%API_VERSION%%/glibmm/convert.h
 include/glibmm-%%API_VERSION%%/glibmm/date.h
+include/glibmm-%%API_VERSION%%/glibmm/datetime.h
 include/glibmm-%%API_VERSION%%/glibmm/debug.h
 include/glibmm-%%API_VERSION%%/glibmm/dispatcher.h
 include/glibmm-%%API_VERSION%%/glibmm/error.h
@@ -208,9 +264,11 @@ include/glibmm-%%API_VERSION%%/glibmm/optiongroup.h
 include/glibmm-%%API_VERSION%%/glibmm/pattern.h
 include/glibmm-%%API_VERSION%%/glibmm/priorities.h
 include/glibmm-%%API_VERSION%%/glibmm/private/balancedtree_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/bytes_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/checksum_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/convert_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/datetime_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h
@@ -226,6 +284,8 @@ include/glibmm-%%API_VERSION%%/glibmm/private/regex_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/shell_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/threads_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/timezone_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/unicode_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/uriutils_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/valuearray_p.h
@@ -249,8 +309,10 @@ include/glibmm-%%API_VERSION%%/glibmm/streamiochannel.h
 include/glibmm-%%API_VERSION%%/glibmm/stringutils.h
 include/glibmm-%%API_VERSION%%/glibmm/thread.h
 include/glibmm-%%API_VERSION%%/glibmm/threadpool.h
+include/glibmm-%%API_VERSION%%/glibmm/threads.h
 include/glibmm-%%API_VERSION%%/glibmm/timer.h
 include/glibmm-%%API_VERSION%%/glibmm/timeval.h
+include/glibmm-%%API_VERSION%%/glibmm/timezone.h
 include/glibmm-%%API_VERSION%%/glibmm/unicode.h
 include/glibmm-%%API_VERSION%%/glibmm/uriutils.h
 include/glibmm-%%API_VERSION%%/glibmm/ustring.h
@@ -290,6 +352,11 @@ lib/glibmm-%%VERSION%%/proc/m4/ctor.m4
 lib/glibmm-%%VERSION%%/proc/m4/doc.m4
 lib/glibmm-%%VERSION%%/proc/m4/enum.m4
 lib/glibmm-%%VERSION%%/proc/m4/gerror.m4
+lib/glibmm-%%VERSION%%/proc/m4/initialize.m4
+lib/glibmm-%%VERSION%%/proc/m4/initialize_base.m4
+lib/glibmm-%%VERSION%%/proc/m4/initialize_gio.m4
+lib/glibmm-%%VERSION%%/proc/m4/initialize_glib.m4
+lib/glibmm-%%VERSION%%/proc/m4/initialize_glibmm.m4
 lib/glibmm-%%VERSION%%/proc/m4/list.m4
 lib/glibmm-%%VERSION%%/proc/m4/member.m4
 lib/glibmm-%%VERSION%%/proc/m4/method.m4
@@ -320,17 +387,16 @@ lib/libglibmm_generate_extra_defs-%%VERSION%%.so
 lib/libglibmm_generate_extra_defs-%%VERSION%%.so.1
 libdata/pkgconfig/giomm-%%API_VERSION%%.pc
 libdata/pkgconfig/glibmm-%%API_VERSION%%.pc
-share/aclocal/glibmm_check_perl.m4
-@dirrm lib/glibmm-%%API_VERSION%%/proc/m4
 @dirrm lib/glibmm-%%API_VERSION%%/proc/pm
+@dirrm lib/glibmm-%%API_VERSION%%/proc/m4
 @dirrm lib/glibmm-%%API_VERSION%%/proc
 @dirrm lib/glibmm-%%API_VERSION%%/include
 @dirrm lib/glibmm-%%API_VERSION%%
 @dirrm lib/giomm-%%API_VERSION%%/include
 @dirrm lib/giomm-%%API_VERSION%%
+@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs
 @dirrm include/glibmm-%%API_VERSION%%/glibmm/private
 @dirrm include/glibmm-%%API_VERSION%%/glibmm
-@dirrm include/glibmm-%%API_VERSION%%/glibmm_generate_extra_defs
 @dirrm include/glibmm-%%API_VERSION%%
 @dirrm include/giomm-%%API_VERSION%%/giomm/private
 @dirrm include/giomm-%%API_VERSION%%/giomm
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 92bd2df9068b..60f970093b82 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -1,24 +1,18 @@
-# New ports collection makefile for:	gnomecommon
-# Date created:				04 April 2002
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#    $MCom: ports/devel/gnome-common/Makefile,v 1.15 2009/09/26 13:41:58 marcus Exp $
-#
+#    $MCom: ports/devel/gnome-common/Makefile,v 1.20 2012/10/16 08:47:10 kwm Exp $
 
 PORTNAME=	gnome-common
-PORTVERSION=	2.28.0
-PORTREVISION=	2
+PORTVERSION=	3.6.0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Common automake macros for GNOME and GNOME 2
+COMMENT=	Common automake macros for GNOME 2 and GNOME 3
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/gnome-common/distinfo b/devel/gnome-common/distinfo
index 0b1846f20689..5ce2e2210154 100644
--- a/devel/gnome-common/distinfo
+++ b/devel/gnome-common/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gnome-common-2.28.0.tar.bz2) = dd4817103d23745d00c735dd137951552ba7b576cb8f68e6a529d06661e9b6a1
-SIZE (gnome2/gnome-common-2.28.0.tar.bz2) = 151535
+SHA256 (gnome2/gnome-common-3.6.0.tar.xz) = e10f09de06bddcc8f980422e3bfdcd8185eee7f1eae11543a765ec8e764b8d95
+SIZE (gnome2/gnome-common-3.6.0.tar.xz) = 143636
diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh
deleted file mode 100644
index 5a2716d05123..000000000000
--- a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-From 1fed4ee7015b89a1ac4c4a535aeb753e820e4970 Mon Sep 17 00:00:00 2001
-From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
-Date: Sun, 29 Apr 2012 17:44:32 +0000
-Subject: Add support for automake 1.12
-
-Bug #675093.
----
-diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
-index 9967f89..3179c3f 100644
---- macros2/gnome-autogen.sh
-+++ macros2/gnome-autogen.sh
-@@ -325,13 +325,14 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`
- 
- case $REQUIRED_AUTOMAKE_VERSION in
-     1.4*) automake_progs="automake-1.4" ;;
--    1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
--    1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
--    1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
--    1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
--    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
--    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
--    1.11*) automake_progs="automake-1.11" ;;
-+    1.5*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-+    1.6*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-+    1.7*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-+    1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
-+    1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
-+    1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;;
-+    1.11*) automake_progs="automake-1.12 automake-1.11" ;;
-+    1.12*) automake_progs="automake-1.12" ;;
- esac
- version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
-     "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
---
-cgit v0.9.0.2
diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config
deleted file mode 100644
index dc6703919abe..000000000000
--- a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=427432
-https://bugzilla.gnome.org/show_bug.cgi?id=680363
-
---- ./macros2/gnome-autogen.sh.orig	2009-05-27 23:29:07.000000000 +0200
-+++ ./macros2/gnome-autogen.sh	2012-07-24 10:29:13.064750613 +0200
-@@ -77,6 +77,7 @@
-     vc_min_version=$4
-     vc_source=$5
-     vc_status=1
-+    vc_option="--version"
- 
-     vc_checkprog=`eval echo "\\$$vc_variable"`
-     if [ -n "$vc_checkprog" ]; then
-@@ -89,11 +90,19 @@
-     else
- 	vc_comparator=">="
-     fi
-+    # The most reliable way to check pkg-config version is to query the actual
-+    # virtual
-+    # pkg-config package entry's modversion.  This works in all known
-+    # implementations.
-+
-+    if test "x$vc_package" = "xpkg-config"; then
-+	vc_option="--modversion pkg-config"
-+    fi
-     printbold "checking for $vc_package $vc_comparator $vc_min_version..."
-     for vc_checkprog in $vc_checkprogs; do
- 	echo $ECHO_N "  testing $vc_checkprog... " $ECHO_C
--	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
--	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
-+	if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then
-+	    vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \
-                                sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
- 	    if compare_versions $vc_min_version $vc_actual_version; then
- 		echo "found $vc_actual_version"
diff --git a/devel/gnome-common/pkg-plist b/devel/gnome-common/pkg-plist
index 081a3d75ee4c..eb75c41be53e 100644
--- a/devel/gnome-common/pkg-plist
+++ b/devel/gnome-common/pkg-plist
@@ -1,5 +1,6 @@
 bin/gnome-autogen.sh
 bin/gnome-doc-common
+share/aclocal/gnome-code-coverage.m4
 share/aclocal/gnome-common.m4
 share/aclocal/gnome-compiler-flags.m4
 %%DATADIR%%/data/omf.make
diff --git a/devel/gnome-js-common/Makefile b/devel/gnome-js-common/Makefile
index 519873add564..dd3ffc668f78 100644
--- a/devel/gnome-js-common/Makefile
+++ b/devel/gnome-js-common/Makefile
@@ -21,6 +21,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gnomehack intltool
+USE_PKGCONFIG=	build
 
 PORTDOCS=	AUTHORS COPYING INSTALL NEWS README ChangeLog
 
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 82082129511f..c2b1f5284c3d 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -17,6 +17,7 @@ COMMENT=	A preprocessor for making GObjects with inline C
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index 35312296c6e3..2015f253a605 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -1,14 +1,9 @@
-# New ports collection makefile for:	gobject-introspection
-# Date created:				19 July 2009
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.39 2011/06/11 19:51:15 mezz Exp $
-#
+#   $MCom: ports/devel/gobject-introspection/Makefile,v 1.51 2013/02/18 22:07:40 kwm Exp $
 
 PORTNAME=	gobject-introspection
-PORTVERSION=	0.10.8
-PORTREVISION=	3
+PORTVERSION=	1.34.2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,12 +11,15 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Generate interface introspection data for GObject libraries
 
+# we need cairo otherwise the generated Cairo gir is broken
+BUILD_DEPENDS=	cairo-trace:${PORTSDIR}/graphics/cairo
 LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack glib20 ltverhack
+USE_GNOME=	gnomehier gnomehack glib20 ltverhack
+USE_PKGCONFIG=	build
 USE_PYTHON=	-2.7
 USE_BISON=	build
 USE_GETTEXT=	yes
@@ -37,15 +35,4 @@ MAKE_ENV=	HOME=${WRKDIR}
 
 MAN1=		g-ir-compiler.1 g-ir-generate.1 g-ir-scanner.1
 
-
-post-patch:
-	@${REINPLACE_CMD} -e "s|'cc'|'${CC:Q:C/[[:space:]]+/', '/g}'|g" \
-		${WRKSRC}/giscanner/sourcescanner.py
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "arm"
-BROKEN=		Does not compile on arm
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gobject-introspection/distinfo b/devel/gobject-introspection/distinfo
index c1537f1494e8..c8a30b46dd2f 100644
--- a/devel/gobject-introspection/distinfo
+++ b/devel/gobject-introspection/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gobject-introspection-0.10.8.tar.bz2) = 5b1387ff37f03db880a2b1cbd6c6b6dfb923a29468d4d8367c458abf7704c61e
-SIZE (gnome3/gobject-introspection-0.10.8.tar.bz2) = 1024874
+SHA256 (gnome3/gobject-introspection-1.34.2.tar.xz) = bc7948a35ce2218922dfb0806679cad21060715cc0c340cf7823eb633cc03429
+SIZE (gnome3/gobject-introspection-1.34.2.tar.xz) = 1088768
diff --git a/devel/gobject-introspection/files/patch-Makefile.in b/devel/gobject-introspection/files/patch-Makefile.in
index fea86b08b627..d35bf348b2d8 100644
--- a/devel/gobject-introspection/files/patch-Makefile.in
+++ b/devel/gobject-introspection/files/patch-Makefile.in
@@ -1,18 +1,16 @@
---- Makefile.in.orig	2010-12-24 00:50:07.000000000 +0100
-+++ Makefile.in	2010-12-24 00:51:39.000000000 +0100
-@@ -864,13 +864,13 @@
+--- Makefile.in.orig	2012-10-02 11:01:03.000000000 +0000
++++ Makefile.in	2012-10-02 11:02:59.000000000 +0000
+@@ -973,12 +973,11 @@
  GLib_2_0_gir_PACKAGES = glib-2.0
  GLib_2_0_gir_CFLAGS = \
              -I$(GLIB_INCLUDEDIR) \
 -            -I$(GLIB_LIBDIR)/glib-2.0/include \
-+            -I$(GLIB_INCLUDEDIR)/.. \
              -DGETTEXT_PACKAGE=Dummy \
              -DGLIB_COMPILATION \
              -D__G_I18N_LIB_H__
  
- GLib_2_0_gir_FILES = \
--                $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
-+                $(GLIB_INCLUDEDIR)/glibconfig.h \
+-GLib_2_0_gir_FILES = $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \
++GLib_2_0_gir_FILES = $(GLIB_INCLUDEDIR)/glibconfig.h \
  	$(GLIB_INCLUDEDIR)/glib/*.h \
-                 gir/glib-2.0.c
- 
+ 	$(GLIB_INCLUDEDIR)/gobject/glib-types.h gir/glib-2.0.c \
+ 	$(am__append_4)
diff --git a/devel/gobject-introspection/files/patch-configure b/devel/gobject-introspection/files/patch-configure
index 7fbbcde68d78..d2838d890f5e 100644
--- a/devel/gobject-introspection/files/patch-configure
+++ b/devel/gobject-introspection/files/patch-configure
@@ -1,11 +1,29 @@
---- configure.orig	2011-05-02 17:19:45.000000000 -0500
-+++ configure	2011-05-02 17:19:58.000000000 -0500
-@@ -15983,7 +15983,7 @@
+--- configure.orig	2011-09-23 11:49:54.000000000 +0200
++++ configure	2011-09-23 11:50:31.000000000 +0200
+@@ -14400,10 +14400,10 @@
  $as_echo_n "checking for headers required to compile python extensions... " >&6; }
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
--PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-+PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
- if test "$py_prefix" != "$py_exec_prefix"; then
-   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+-if test "x$PYTHON_INCLUDES" == x; then
+-  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
++if test "x$PYTHON_INCLUDES" = x; then
++  PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
+   if test "$py_prefix" != "$py_exec_prefix"; then
+-    PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
++    PYTHON_INCLUDES=`python${PYTHON_VERSION}-config --cflags`
+   fi
  fi
+ 
+@@ -14429,10 +14429,10 @@
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to link against libpython" >&5
+ $as_echo_n "checking for libraries required to link against libpython... " >&6; }
+-if test "x$PYTHON_LIBS" == x; then
++if test "x$PYTHON_LIBS" = x; then
+ 	PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}"
+ fi
+-if test "x$PYTHON_LIB_LOC" == x; then
++if test "x$PYTHON_LIB_LOC" = x; then
+ 	PYTHON_LIB_LOC="${py_prefix}/lib"
+ fi
+ 
diff --git a/devel/gobject-introspection/pkg-plist b/devel/gobject-introspection/pkg-plist
index c39c55aa80c4..2d400ec2ebe0 100644
--- a/devel/gobject-introspection/pkg-plist
+++ b/devel/gobject-introspection/pkg-plist
@@ -7,7 +7,6 @@ include/gobject-introspection-1.0/gibaseinfo.h
 include/gobject-introspection-1.0/gicallableinfo.h
 include/gobject-introspection-1.0/giconstantinfo.h
 include/gobject-introspection-1.0/gienuminfo.h
-include/gobject-introspection-1.0/gierrordomaininfo.h
 include/gobject-introspection-1.0/gifieldinfo.h
 include/gobject-introspection-1.0/gifunctioninfo.h
 include/gobject-introspection-1.0/giinterfaceinfo.h
@@ -51,6 +50,9 @@ lib/gobject-introspection/giscanner/annotationmain.pyo
 lib/gobject-introspection/giscanner/annotationparser.py
 lib/gobject-introspection/giscanner/annotationparser.pyc
 lib/gobject-introspection/giscanner/annotationparser.pyo
+lib/gobject-introspection/giscanner/annotationpatterns.py
+lib/gobject-introspection/giscanner/annotationpatterns.pyc
+lib/gobject-introspection/giscanner/annotationpatterns.pyo
 lib/gobject-introspection/giscanner/ast.py
 lib/gobject-introspection/giscanner/ast.pyc
 lib/gobject-introspection/giscanner/ast.pyo
@@ -60,9 +62,9 @@ lib/gobject-introspection/giscanner/cachestore.pyo
 lib/gobject-introspection/giscanner/codegen.py
 lib/gobject-introspection/giscanner/codegen.pyc
 lib/gobject-introspection/giscanner/codegen.pyo
-lib/gobject-introspection/giscanner/config.py
-lib/gobject-introspection/giscanner/config.pyc
-lib/gobject-introspection/giscanner/config.pyo
+lib/gobject-introspection/giscanner/docmain.py
+lib/gobject-introspection/giscanner/docmain.pyc
+lib/gobject-introspection/giscanner/docmain.pyo
 lib/gobject-introspection/giscanner/dumper.py
 lib/gobject-introspection/giscanner/dumper.pyc
 lib/gobject-introspection/giscanner/dumper.pyo
@@ -84,6 +86,27 @@ lib/gobject-introspection/giscanner/libtoolimporter.pyo
 lib/gobject-introspection/giscanner/maintransformer.py
 lib/gobject-introspection/giscanner/maintransformer.pyc
 lib/gobject-introspection/giscanner/maintransformer.pyo
+lib/gobject-introspection/giscanner/mallard-C-class.tmpl
+lib/gobject-introspection/giscanner/mallard-C-default.tmpl
+lib/gobject-introspection/giscanner/mallard-C-enum.tmpl
+lib/gobject-introspection/giscanner/mallard-C-function.tmpl
+lib/gobject-introspection/giscanner/mallard-C-namespace.tmpl
+lib/gobject-introspection/giscanner/mallard-C-property.tmpl
+lib/gobject-introspection/giscanner/mallard-C-record.tmpl
+lib/gobject-introspection/giscanner/mallard-C-signal.tmpl
+lib/gobject-introspection/giscanner/mallard-C-vfunc.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-class.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-default.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-enum.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-function.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-namespace.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-property.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-record.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-signal.tmpl
+lib/gobject-introspection/giscanner/mallard-Python-vfunc.tmpl
+lib/gobject-introspection/giscanner/mallardwriter.py
+lib/gobject-introspection/giscanner/mallardwriter.pyc
+lib/gobject-introspection/giscanner/mallardwriter.pyo
 lib/gobject-introspection/giscanner/message.py
 lib/gobject-introspection/giscanner/message.pyc
 lib/gobject-introspection/giscanner/message.pyo
@@ -148,7 +171,6 @@ share/gtk-doc/html/gi/gi-GIBaseInfo.html
 share/gtk-doc/html/gi/gi-GICallableInfo.html
 share/gtk-doc/html/gi/gi-GIConstantInfo.html
 share/gtk-doc/html/gi/gi-GIEnumInfo.html
-share/gtk-doc/html/gi/gi-GIErrorDomainInfo.html
 share/gtk-doc/html/gi/gi-GIFieldInfo.html
 share/gtk-doc/html/gi/gi-GIFunctionInfo.html
 share/gtk-doc/html/gi/gi-GIInterfaceInfo.html
@@ -161,6 +183,7 @@ share/gtk-doc/html/gi/gi-GITypeInfo.html
 share/gtk-doc/html/gi/gi-GIUnionInfo.html
 share/gtk-doc/html/gi/gi-GIVFuncInfo.html
 share/gtk-doc/html/gi/gi-ffi.html
+share/gtk-doc/html/gi/gi-gierrordomaininfo.html
 share/gtk-doc/html/gi/gi-gir-reference.html
 share/gtk-doc/html/gi/gi-gir.html
 share/gtk-doc/html/gi/gi-girepository.html
@@ -171,7 +194,6 @@ share/gtk-doc/html/gi/gi-overview.html
 share/gtk-doc/html/gi/gi-repository-structs.html
 share/gtk-doc/html/gi/gi-struct-hierarchy.html
 share/gtk-doc/html/gi/gi-typelib.html
-share/gtk-doc/html/gi/gi.devhelp
 share/gtk-doc/html/gi/gi.devhelp2
 share/gtk-doc/html/gi/girepository.html
 share/gtk-doc/html/gi/glib.html
@@ -188,8 +210,6 @@ share/gtk-doc/html/gi/up.png
 @dirrmtry share/gtk-doc
 @dirrm share/gobject-introspection-1.0/tests
 @dirrm share/gobject-introspection-1.0
-@dirrmtry share/gir-1.0
-@dirrmtry lib/girepository-1.0
 @dirrm lib/gobject-introspection/giscanner
 @dirrm lib/gobject-introspection
 @dirrm include/gobject-introspection-1.0
diff --git a/devel/gsettings-desktop-schemas/Makefile b/devel/gsettings-desktop-schemas/Makefile
index c46e2c53f974..96aeacf2e02e 100644
--- a/devel/gsettings-desktop-schemas/Makefile
+++ b/devel/gsettings-desktop-schemas/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gsettings-desktop-schemas
-# Date created:				14 Aug 2010
-# Whom:					Koop Mast <kwm@FreeBSD.org>
-#
+# Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/gsettings-desktop-schemas/Makefile,v 1.13 2011/04/27 21:18:30 kwm Exp $
-#
 
 PORTNAME=	gsettings-desktop-schemas
 PORTVERSION=	3.0.1
@@ -24,6 +20,7 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=	yes
 USE_GNOME=	gnomehack intltool glib20
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 
 GLIB_SCHEMAS=	org.gnome.desktop.a11y.applications.gschema.xml \
diff --git a/devel/guikachu/Makefile b/devel/guikachu/Makefile
index 9c7f905fd285..34e14d5e3319 100644
--- a/devel/guikachu/Makefile
+++ b/devel/guikachu/Makefile
@@ -33,4 +33,8 @@ GCONF_SCHEMAS=	guikachu-form-editor.schemas guikachu-interface.schemas \
 #		-e '/(UPDATE_MIME)/s|(mimedir)|(prefix)/share/mime|' \
 #		${WRKSRC}/data/Makefile.in
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/gwin32.h>|glib.h>|g' \
+		${WRKSRC}/src/ui.cc
+
 .include <bsd.port.mk>
diff --git a/devel/gvfs/Makefile b/devel/gvfs/Makefile
index 4d93e890610b..0e06ee0bbfce 100644
--- a/devel/gvfs/Makefile
+++ b/devel/gvfs/Makefile
@@ -1,24 +1,23 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gvfs/Makefile,v 1.70 2011/01/31 19:06:42 kwm Exp $
-#
+#   $MCom: ports/devel/gvfs/Makefile,v 1.85 2012/12/14 16:09:28 kwm Exp $
 
 PORTNAME=	gvfs
-PORTVERSION=	1.6.6
-PORTREVISION=	3
+PORTVERSION=	1.12.3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME virtual file system
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus \
-		soup-gnome-2.4.1:${PORTSDIR}/devel/libsoup-gnome \
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
+		soup-gnome-2.4:${PORTSDIR}/devel/libsoup-gnome \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 
-USE_BZIP2=	yes
-USE_GNOME=	glib20 gnomehack gnomeprefix intlhack gconf2
+USE_XZ=		yes
+USE_GNOME=	glib20 gnomehack gnomeprefix intlhack intltool
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
@@ -27,16 +26,18 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-obexftp \
 		--disable-afc
-OPTIONS=	FUSE "Enable fuse" off \
-		AVAHI "Enable AVAHI" on \
-		SAMBA "Enable Samba" on \
-		GPHOTO2 "Enable Gphoto 2 camera support (required HAL)" on \
-		CDDA "Enable CDDA (required HAL)" on \
-		HAL "Enable HAL" on
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	AVAHI SAMBA GPHOTO2 CDDA HAL FUSE
+OPTIONS_DEFAULT=AVAHI SAMBA GPHOTO2 CDDA HAL
+CDDA_DESC=	CDDA (enables HAL)
+GPHOTO2_DESC=	Gphoto 2 camera support (enables HAL)
+SAMBA_DESC=	Samba support
 
-.if defined(WITH_FUSE)
+GLIB_SCHEMAS=	org.gnome.system.gvfs.enums.xml
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFUSE}
 USES+=		fuse
 PLIST_SUB+=	FUSE=""
 .else
@@ -44,40 +45,42 @@ CONFIGURE_ARGS+=	--disable-fuse
 PLIST_SUB+=	FUSE="@comment "
 .endif
 
-.if defined(WITH_SAMBA)
-LIB_DEPENDS+=	smbclient.0:${PORTSDIR}/net/samba-libsmbclient
+.if ${PORT_OPTIONS:MSAMBA}
+LIB_DEPENDS+=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+GLIB_SCHEMAS+=	org.gnome.system.smb.gschema.xml
 PLIST_SUB+=	SMB=""
 .else
 CONFIGURE_ARGS+=	--disable-samba
 PLIST_SUB+=	SMB="@comment "
 .endif
 
-.if defined(WITH_CDDA) && !defined(WITHOUT_HAL)
-LIB_DEPENDS+=	cdio_paranoia.1:${PORTSDIR}/sysutils/libcdio
+.if ${PORT_OPTIONS:MCDDA}
+LIB_DEPENDS+=	cdio_paranoia:${PORTSDIR}/sysutils/libcdio
 PLIST_SUB+=	CDDA=""
 .else
 CONFIGURE_ARGS+=	--disable-cdda
 PLIST_SUB+=	CDDA="@comment "
 .endif
 
-.if defined(WITH_GPHOTO2) && !defined(WITHOUT_HAL)
-LIB_DEPENDS+=	gphoto2.2:${PORTSDIR}/graphics/libgphoto2
+.if ${PORT_OPTIONS:MGPHOTO2}
+LIB_DEPENDS+=	gphoto2:${PORTSDIR}/graphics/libgphoto2
 PLIST_SUB+=	GPHOTO2=""
 .else
 CONFIGURE_ARGS+=	--disable-gphoto2
 PLIST_SUB+=	GPHOTO2="@comment "
 .endif
 
-.if defined(WITH_AVAHI)
-LIB_DEPENDS+=	avahi-client.3:${PORTSDIR}/net/avahi-app
+.if ${PORT_OPTIONS:MAVAHI}
+LIB_DEPENDS+=	avahi-client:${PORTSDIR}/net/avahi-app
+GLIB_SCHEMAS+=	org.gnome.system.dns_sd.gschema.xml
 PLIST_SUB+=	AVAHI=""
 .else
 CONFIGURE_ARGS+=--disable-avahi
 PLIST_SUB+=	AVAHI="@comment "
 .endif
 
-.if defined(WITH_HAL)
-LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+.if ${PORT_OPTIONS:MHAL} || ${PORT_OPTIONS:MGPHOTO2} || ${PORT_OPTIONS:MCDDA}
+LIB_DEPENDS+=	hal:${PORTSDIR}/sysutils/hal
 RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
 PLIST_SUB+=	HAL=""
 .else
@@ -85,8 +88,4 @@ CONFIGURE_ARGS+=--disable-hal
 PLIST_SUB+=	HAL="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
-		${WRKSRC}/gconf/Makefile.in
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/gvfs/distinfo b/devel/gvfs/distinfo
index 5cd6abd7ebc4..b58710e7609a 100644
--- a/devel/gvfs/distinfo
+++ b/devel/gvfs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gvfs-1.6.6.tar.bz2) = 902890deb6a670f642180ea958406ebb02af1d5867a464c87e493d56f1dde7bd
-SIZE (gnome2/gvfs-1.6.6.tar.bz2) = 1387796
+SHA256 (gnome3/gvfs-1.12.3.tar.xz) = 38f69ec92083f86a51e7814e98d2861151f16dfb3abe4b3b39488408e12fd9c2
+SIZE (gnome3/gvfs-1.12.3.tar.xz) = 1361968
diff --git a/devel/gvfs/files/patch-client_Makefile.in b/devel/gvfs/files/patch-client_Makefile.in
index ffbfd5878dc1..1470cbce0ef6 100644
--- a/devel/gvfs/files/patch-client_Makefile.in
+++ b/devel/gvfs/files/patch-client_Makefile.in
@@ -1,11 +1,11 @@
---- client/Makefile.in.orig	2008-02-11 20:05:14.000000000 -0500
-+++ client/Makefile.in	2008-02-11 20:05:42.000000000 -0500
-@@ -152,7 +152,7 @@ EXEEXT = @EXEEXT@
- F77 = @F77@
- FFLAGS = @FFLAGS@
+--- client/Makefile.in.orig	2010-12-26 18:25:46.000000000 +0100
++++ client/Makefile.in	2010-12-26 18:26:12.000000000 +0100
+@@ -196,7 +196,7 @@
+ EXPAT_LIBS = @EXPAT_LIBS@
+ FGREP = @FGREP@
  FUSE_CFLAGS = @FUSE_CFLAGS@
 -FUSE_LIBS = @FUSE_LIBS@
 +FUSE_LIBS = @FUSE_LIBS@ -lfuse
- GCONF_CFLAGS = @GCONF_CFLAGS@
- GCONF_LIBS = @GCONF_LIBS@
+ GDU_CFLAGS = @GDU_CFLAGS@
+ GDU_LIBS = @GDU_LIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
diff --git a/devel/gvfs/files/patch-client_gvfsfusedaemon.c b/devel/gvfs/files/patch-client_gvfsfusedaemon.c
index 2ea9b3330625..0d9c69189b48 100644
--- a/devel/gvfs/files/patch-client_gvfsfusedaemon.c
+++ b/devel/gvfs/files/patch-client_gvfsfusedaemon.c
@@ -1,17 +1,7 @@
---- client/gvfsfusedaemon.c.orig	2010-11-12 16:42:49.000000000 +0100
-+++ client/gvfsfusedaemon.c	2010-11-21 18:23:36.000000000 +0100
-@@ -26,7 +26,9 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/un.h>
-+#ifdef __linux__
- #include <sys/vfs.h>
-+#endif
- #include <sys/time.h>
- #include <unistd.h>
- #include <stdlib.h>
-@@ -2340,7 +2342,9 @@
-   subthread = g_thread_create ((GThreadFunc) subthread_main, NULL, FALSE, NULL);
+--- client/gvfsfusedaemon.c.orig	2012-05-15 20:01:49.000000000 +0200
++++ client/gvfsfusedaemon.c	2012-05-31 14:00:26.000000000 +0200
+@@ -2361,7 +2361,9 @@
+   subthread = g_thread_new ("gvfs-fuse-sub", (GThreadFunc) subthread_main, NULL);
  
    /* Indicate O_TRUNC support for open() */
 +#ifdef FUSE_CAP_ATOMIC_O_TRUNC
diff --git a/devel/gvfs/pkg-plist b/devel/gvfs/pkg-plist
index bbc4ad1a7c89..5463953eabf4 100644
--- a/devel/gvfs/pkg-plist
+++ b/devel/gvfs/pkg-plist
@@ -3,6 +3,7 @@ bin/gvfs-copy
 bin/gvfs-info
 bin/gvfs-less
 bin/gvfs-ls
+bin/gvfs-mime
 bin/gvfs-mkdir
 bin/gvfs-monitor-dir
 bin/gvfs-monitor-file
@@ -18,8 +19,6 @@ bin/gvfs-tree
 etc/profile.d/gvfs-bash-completion.sh
 include/gvfs-client/gvfs/gvfsurimapper.h
 include/gvfs-client/gvfs/gvfsuriutils.h
-lib/gio/modules/libgiogconf.la
-lib/gio/modules/libgiogconf.so
 lib/gio/modules/libgioremote-volume-monitor.la
 lib/gio/modules/libgioremote-volume-monitor.so
 lib/gio/modules/libgvfsdbus.la
@@ -30,6 +29,8 @@ lib/gio/modules/libgvfsdbus.so
 lib/libgvfscommon.la
 lib/libgvfscommon.so
 lib/libgvfscommon.so.0
+libexec/gvfsd-afp
+libexec/gvfsd-afp-browse
 %%FUSE%%libexec/gvfs-fuse-daemon
 %%GPHOTO2%%libexec/gvfs-gphoto2-volume-monitor
 %%HAL%%libexec/gvfs-hal-volume-monitor
@@ -50,32 +51,37 @@ libexec/gvfsd-sftp
 %%SMB%%libexec/gvfsd-smb
 %%SMB%%libexec/gvfsd-smb-browse
 libexec/gvfsd-trash
+%%AVAHI%%share/GConf/gsettings/gvfs-dns-sd.convert
+%%SMB%%share/GConf/gsettings/gvfs-smb.convert
 share/dbus-1/services/gvfs-daemon.service
 share/dbus-1/services/gvfs-metadata.service
 %%GPHOTO2%%share/dbus-1/services/org.gtk.Private.GPhoto2VolumeMonitor.service
 %%HAL%%share/dbus-1/services/org.gtk.Private.HalVolumeMonitor.service
-share/gvfs/mounts/archive.mount
-share/gvfs/mounts/burn.mount
-%%CDDA%%share/gvfs/mounts/cdda.mount
-share/gvfs/mounts/computer.mount
-share/gvfs/mounts/dav.mount
-%%AVAHI%%share/gvfs/mounts/dav+sd.mount
-%%AVAHI%%share/gvfs/mounts/dns-sd.mount
-share/gvfs/mounts/ftp.mount
-%%GPHOTO2%%share/gvfs/mounts/gphoto2.mount
-share/gvfs/mounts/http.mount
-share/gvfs/mounts/localtest.mount
-share/gvfs/mounts/network.mount
-share/gvfs/mounts/sftp.mount
-%%SMB%%share/gvfs/mounts/smb-browse.mount
-%%SMB%%share/gvfs/mounts/smb.mount
-share/gvfs/mounts/trash.mount
-%%GPHOTO2%%share/gvfs/remote-volume-monitors/gphoto2.monitor
-%%HAL%%share/gvfs/remote-volume-monitors/hal.monitor
+share/gvfs/mounts/afp-browse.mount
+share/gvfs/mounts/afp.mount
+%%DATADIR%%/mounts/archive.mount
+%%DATADIR%%/mounts/burn.mount
+%%CDDA%%%%DATADIR%%/mounts/cdda.mount
+%%DATADIR%%/mounts/computer.mount
+%%DATADIR%%/mounts/dav.mount
+%%AVAHI%%%%DATADIR%%/mounts/dav+sd.mount
+%%AVAHI%%%%DATADIR%%/mounts/dns-sd.mount
+%%DATADIR%%/mounts/ftp.mount
+%%GPHOTO2%%%%DATADIR%%/mounts/gphoto2.mount
+%%DATADIR%%/mounts/http.mount
+%%DATADIR%%/mounts/localtest.mount
+%%DATADIR%%/mounts/network.mount
+%%DATADIR%%/mounts/sftp.mount
+%%SMB%%%%DATADIR%%/mounts/smb-browse.mount
+%%SMB%%%%DATADIR%%/mounts/smb.mount
+%%DATADIR%%/mounts/trash.mount
+%%GPHOTO2%%%%DATADIR%%/remote-volume-monitors/gphoto2.monitor
+%%HAL%%%%DATADIR%%/remote-volume-monitors/hal.monitor
 share/locale/af/LC_MESSAGES/gvfs.mo
 share/locale/ar/LC_MESSAGES/gvfs.mo
 share/locale/as/LC_MESSAGES/gvfs.mo
 share/locale/ast/LC_MESSAGES/gvfs.mo
+share/locale/be/LC_MESSAGES/gvfs.mo
 share/locale/be@latin/LC_MESSAGES/gvfs.mo
 share/locale/bg/LC_MESSAGES/gvfs.mo
 share/locale/bn/LC_MESSAGES/gvfs.mo
@@ -88,9 +94,11 @@ share/locale/de/LC_MESSAGES/gvfs.mo
 share/locale/el/LC_MESSAGES/gvfs.mo
 share/locale/en@shaw/LC_MESSAGES/gvfs.mo
 share/locale/en_GB/LC_MESSAGES/gvfs.mo
+share/locale/eo/LC_MESSAGES/gvfs.mo
 share/locale/es/LC_MESSAGES/gvfs.mo
 share/locale/et/LC_MESSAGES/gvfs.mo
 share/locale/eu/LC_MESSAGES/gvfs.mo
+share/locale/fa/LC_MESSAGES/gvfs.mo
 share/locale/fi/LC_MESSAGES/gvfs.mo
 share/locale/fr/LC_MESSAGES/gvfs.mo
 share/locale/ga/LC_MESSAGES/gvfs.mo
@@ -139,9 +147,9 @@ share/locale/vi/LC_MESSAGES/gvfs.mo
 share/locale/zh_CN/LC_MESSAGES/gvfs.mo
 share/locale/zh_HK/LC_MESSAGES/gvfs.mo
 share/locale/zh_TW/LC_MESSAGES/gvfs.mo
-@dirrm share/gvfs/remote-volume-monitors
-@dirrm share/gvfs/mounts
-@dirrm share/gvfs
+@dirrm %%DATADIR%%/remote-volume-monitors
+@dirrm %%DATADIR%%/mounts
+@dirrm %%DATADIR%%
 @dirrm include/gvfs-client/gvfs
 @dirrm include/gvfs-client
 @dirrmtry etc/profile.d
diff --git a/devel/hs-gio/Makefile b/devel/hs-gio/Makefile
index feb6d0a883c8..f9b843a2ab5e 100644
--- a/devel/hs-gio/Makefile
+++ b/devel/hs-gio/Makefile
@@ -14,6 +14,7 @@ FILE_LICENSE=	COPYING
 CABAL_SETUP=	Setup.hs
 
 USE_CABAL=	glib>=0.12.0 mtl
+USE_PKGCONFIG=	build
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-glib/Makefile b/devel/hs-glib/Makefile
index b9d8af9f6b4c..266282782ce8 100644
--- a/devel/hs-glib/Makefile
+++ b/devel/hs-glib/Makefile
@@ -15,6 +15,7 @@ CABAL_SETUP=	Setup.hs
 
 USE_CABAL=	gtk2hs-buildtools
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/json-glib/Makefile b/devel/json-glib/Makefile
index acc1af85405b..f77eb3b36ee7 100644
--- a/devel/json-glib/Makefile
+++ b/devel/json-glib/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/json-glib/Makefile,v 1.17 2011/06/15 13:34:36 kwm Exp $
+#   $MCom: ports/devel/json-glib/Makefile,v 1.22 2012/09/01 23:02:09 mezz Exp $
 #
 
 PORTNAME=	json-glib
-PORTVERSION=	0.12.6
+PORTVERSION=	0.14.2
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
@@ -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/json-glib/distinfo b/devel/json-glib/distinfo
index 627b0ca54574..7989ecafc6cb 100644
--- a/devel/json-glib/distinfo
+++ b/devel/json-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (json-glib-0.12.6.tar.xz) = 4f670fc356e7a30121ade956e93236986952bb2601d6678e94eab7d87c8866ce
-SIZE (json-glib-0.12.6.tar.xz) = 369036
+SHA256 (json-glib-0.14.2.tar.xz) = b816a5fa3e5664b08679a6972a6e5693d6cc1990ff4a6f94c07554db96be94a7
+SIZE (json-glib-0.14.2.tar.xz) = 445396
diff --git a/devel/json-glib/pkg-plist b/devel/json-glib/pkg-plist
index 4a0bcfbde4f7..ce25133b80fe 100644
--- a/devel/json-glib/pkg-plist
+++ b/devel/json-glib/pkg-plist
@@ -3,7 +3,9 @@ include/json-glib-1.0/json-glib/json-enum-types.h
 include/json-glib-1.0/json-glib/json-generator.h
 include/json-glib-1.0/json-glib/json-glib.h
 include/json-glib-1.0/json-glib/json-gobject.h
+include/json-glib-1.0/json-glib/json-gvariant.h
 include/json-glib-1.0/json-glib/json-parser.h
+include/json-glib-1.0/json-glib/json-path.h
 include/json-glib-1.0/json-glib/json-reader.h
 include/json-glib-1.0/json-glib/json-types.h
 include/json-glib-1.0/json-glib/json-version.h
@@ -16,6 +18,7 @@ libdata/pkgconfig/json-glib-1.0.pc
 %%DOCSDIR%%/JsonBuilder.html
 %%DOCSDIR%%/JsonGenerator.html
 %%DOCSDIR%%/JsonParser.html
+%%DOCSDIR%%/JsonPath.html
 %%DOCSDIR%%/JsonReader.html
 %%DOCSDIR%%/annotation-glossary.html
 %%DOCSDIR%%/ch01.html
@@ -32,16 +35,17 @@ libdata/pkgconfig/json-glib-1.0.pc
 %%DOCSDIR%%/ix05.html
 %%DOCSDIR%%/ix06.html
 %%DOCSDIR%%/ix07.html
+%%DOCSDIR%%/ix08.html
 %%DOCSDIR%%/json-advanced.html
 %%DOCSDIR%%/json-base.html
 %%DOCSDIR%%/json-glib-Boxed-Types-Serialization.html
 %%DOCSDIR%%/json-glib-GObject-Serialization.html
 %%DOCSDIR%%/json-glib-JSON-Array.html
+%%DOCSDIR%%/json-glib-JSON-GVariant-Integration.html
 %%DOCSDIR%%/json-glib-JSON-Node.html
 %%DOCSDIR%%/json-glib-JSON-Object.html
 %%DOCSDIR%%/json-glib-Serializable-Interface.html
 %%DOCSDIR%%/json-glib-Versioning-information.html
-%%DOCSDIR%%/json-glib.devhelp
 %%DOCSDIR%%/json-glib.devhelp2
 %%DOCSDIR%%/json-glib.html
 %%DOCSDIR%%/json-streams.html
@@ -52,6 +56,7 @@ libdata/pkgconfig/json-glib-1.0.pc
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
 share/gir-1.0/Json-1.0.gir
+share/locale/pl/LC_MESSAGES/json-glib-1.0.mo
 @dirrm %%DOCSDIR%%
 @dirrm include/json-glib-1.0/json-glib
 @dirrm include/json-glib-1.0
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 832c9f3119b2..bf587de16bcf 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   libIDL
-# Date Created:			12 February 2002
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/libIDL/Makefile,v 1.7 2010/04/02 17:27:42 kwm Exp $
-#
 
 PORTNAME=	libIDL
 PORTVERSION=	0.8.14
@@ -21,6 +17,7 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_BISON=	build
 USE_GNOME=	gnomehack glib20
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
diff --git a/devel/libassetml/Makefile b/devel/libassetml/Makefile
index aa5c1f5bd444..192405a79cd6 100644
--- a/devel/libassetml/Makefile
+++ b/devel/libassetml/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	libassetml
-# Date created:			2 Dec 2003
-# Whom:				Alexander Nedotsukov <bland@FreeBSD.org>
-#
+# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	libassetml
 PORTVERSION=	1.2.1
@@ -14,12 +10,13 @@ MASTER_SITES=	SF/ofset/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Devel Library to share image and audio files between projects
 
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 BUILD_DEPENDS=	texi2html:${PORTSDIR}/textproc/texi2html
+LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt
 
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack lthack gnomeprefix glib20 libxml2 pkgconfig
+USE_GNOME=	gnomehack lthack gnomeprefix glib20 libxml2
+USE_PKGCONFIG=	build
 USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 0742d8a46ee8..a5967f0ade47 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   libbonobo
-# Date Created:			14 February 2002
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/libbonobo/Makefile,v 1.84 2010/09/26 20:57:33 kwm Exp $
-#
 
 PORTNAME=	libbonobo
 PORTVERSION=	2.32.0
@@ -29,6 +25,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack intlhack libxml2 orbit2 referencehack
+USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/libg19draw/Makefile b/devel/libg19draw/Makefile
index c020484adfe8..805798b3050d 100644
--- a/devel/libg19draw/Makefile
+++ b/devel/libg19draw/Makefile
@@ -20,6 +20,7 @@ CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -pthread"
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
 
 PLIST_FILES=	include/libg19draw.h \
 		lib/libg19draw.a \
diff --git a/devel/libgalago/Makefile b/devel/libgalago/Makefile
index b056f7ca0546..bd6fc6d8f25f 100644
--- a/devel/libgalago/Makefile
+++ b/devel/libgalago/Makefile
@@ -1,9 +1,4 @@
-# New ports collection makefile for:	libgalago
-# Date created:				Apr 27 2007
-# Whom:					Florent Thoumie <flz@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	libgalago
 PORTVERSION=	0.5.2
@@ -19,7 +14,7 @@ LIB_PC_DEPENDS=	dbus-glib-1.pc:${PORTSDIR}/devel/dbus-glib
 BUILD_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 RUN_DEPENDS+=	${LIB_PC_DEPENDS:C|^|${LOCALBASE}/libdata/pkgconfig/|g}
 
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/libgee/Makefile b/devel/libgee/Makefile
index e44734eddb93..70dd8e3cf831 100644
--- a/devel/libgee/Makefile
+++ b/devel/libgee/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	libgee
-# Date created:				2010-03-14
-# Whom:					Frank Steinborn <steinex@nognu.de>
-#
+# Created by: Frank Steinborn <steinex@nognu.de>
 # $FreeBSD$
-#
+#    $MCom: ports/devel/libgee/Makefile,v 1.13 2012/10/14 20:47:22 kwm Exp $
 
 PORTNAME=	libgee
-PORTVERSION=	0.6.2.1
+PORTVERSION=	0.8.5
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
@@ -19,7 +16,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection=yes
 USE_GMAKE=	yes
 USE_XZ=		yes
-USE_GNOME=	glib20 gnomehack
+USE_GNOME=	glib20 gnomehier gnomehack
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/libgee/distinfo b/devel/libgee/distinfo
index c008ac21b2df..3ab1495fb632 100644
--- a/devel/libgee/distinfo
+++ b/devel/libgee/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libgee-0.6.2.1.tar.xz) = 478f7daebe8369ad72bf83431d953db772af6865ff3aa21bf75bf6730f561389
-SIZE (libgee-0.6.2.1.tar.xz) = 400736
+SHA256 (libgee-0.8.5.tar.xz) = f1349ca82dc5da49c98ce14020f1ed7bd41d8826d4c72526d1a46f82d99e5c09
+SIZE (libgee-0.8.5.tar.xz) = 583804
diff --git a/devel/libgee/files/patch-gee_Makefile.in b/devel/libgee/files/patch-gee_Makefile.in
deleted file mode 100644
index 6a506df72736..000000000000
--- a/devel/libgee/files/patch-gee_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- gee/Makefile.in.orig	2010-08-08 13:36:58.000000000 +0200
-+++ gee/Makefile.in	2010-08-08 13:37:42.000000000 +0200
-@@ -872,7 +872,7 @@
- 	touch $@
- 
- @HAVE_INTROSPECTION_TRUE@Gee-1.0.typelib: Gee-1.0.gir
--@HAVE_INTROSPECTION_TRUE@	@INTROSPECTION_COMPILER@ --shared-library=libgee -o $@ $^
-+@HAVE_INTROSPECTION_TRUE@	@INTROSPECTION_COMPILER@ --shared-library=libgee Gee-1.0.gir -o $@ $^
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/libgee/pkg-plist b/devel/libgee/pkg-plist
index 970a894ce808..262d9084dae1 100644
--- a/devel/libgee/pkg-plist
+++ b/devel/libgee/pkg-plist
@@ -1,13 +1,9 @@
-include/gee-1.0/gee.h
-lib/libgee.la
-lib/libgee.so
-lib/libgee.so.2
-lib/girepository-1.0/Gee-1.0.typelib
-libdata/pkgconfig/gee-1.0.pc
-share/gir-1.0/Gee-1.0.gir
-share/vala/vapi/gee-1.0.vapi
-@dirrm share/vala/vapi
-@dirrm share/vala
-@dirrmtry share/gir-1.0
-@dirrmtry lib/girepository-1.0
-@dirrm include/gee-1.0
+include/gee-0.8/gee.h
+lib/libgee-0.8.la
+lib/libgee-0.8.so
+lib/libgee-0.8.so.2
+lib/girepository-1.0/Gee-0.8.typelib
+libdata/pkgconfig/gee-0.8.pc
+share/gir-1.0/Gee-0.8.gir
+share/vala/vapi/gee-0.8.vapi
+@dirrm include/gee-0.8
diff --git a/devel/libgee06/Makefile b/devel/libgee06/Makefile
new file mode 100644
index 000000000000..9c53f15af852
--- /dev/null
+++ b/devel/libgee06/Makefile
@@ -0,0 +1,24 @@
+# Created by: Frank Steinborn <steinex@nognu.de>
+# $FreeBSD$
+#    $MCom: ports/devel/libgee/Makefile,v 1.13 2012/10/14 20:47:22 kwm Exp $
+
+PORTNAME=	libgee
+PORTVERSION=	0.6.8
+CATEGORIES=	devel
+MASTER_SITES=	GNOME
+
+MAINTAINER=	kwm@FreeBSD.org
+COMMENT=	GObject collection library
+
+BUILD_DEPENDS=	gobject-introspection>=0.9.0:${PORTSDIR}/devel/gobject-introspection
+
+LATEST_LINK=	${PORTNAME}06
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-introspection=yes
+USE_GMAKE=	yes
+USE_XZ=		yes
+USE_GNOME=	glib20 gnomehier gnomehack
+USE_PKGCONFIG=	build
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/libgee06/distinfo b/devel/libgee06/distinfo
new file mode 100644
index 000000000000..d7aa87d0f98f
--- /dev/null
+++ b/devel/libgee06/distinfo
@@ -0,0 +1,2 @@
+SHA256 (libgee-0.6.8.tar.xz) = a61f8d796173d41f6144a030d4bd22461f0bb3fa18a3ebe02341b315feebf5d3
+SIZE (libgee-0.6.8.tar.xz) = 443060
diff --git a/devel/libgee06/pkg-descr b/devel/libgee06/pkg-descr
new file mode 100644
index 000000000000..7123629509b3
--- /dev/null
+++ b/devel/libgee06/pkg-descr
@@ -0,0 +1,4 @@
+Libgee is a collection library providing GObject-based
+interfaces and classes for commonly used data structures.
+
+WWW: http://live.gnome.org/Libgee
diff --git a/devel/libgee06/pkg-plist b/devel/libgee06/pkg-plist
new file mode 100644
index 000000000000..3a0a5f6368da
--- /dev/null
+++ b/devel/libgee06/pkg-plist
@@ -0,0 +1,9 @@
+include/gee-1.0/gee.h
+lib/libgee.la
+lib/libgee.so
+lib/libgee.so.2
+lib/girepository-1.0/Gee-1.0.typelib
+libdata/pkgconfig/gee-1.0.pc
+share/gir-1.0/Gee-1.0.gir
+share/vala/vapi/gee-1.0.vapi
+@dirrm include/gee-1.0
diff --git a/devel/libopensync/files/patch-opensync__opensync_list.c b/devel/libopensync/files/patch-opensync__opensync_list.c
new file mode 100644
index 000000000000..620480ccffdb
--- /dev/null
+++ b/devel/libopensync/files/patch-opensync__opensync_list.c
@@ -0,0 +1,11 @@
+--- opensync/opensync_list.c.orig	2013-02-05 21:45:11.000000000 +0000
++++ opensync/opensync_list.c	2013-02-05 21:45:22.000000000 +0000
+@@ -30,7 +30,7 @@
+  * MT safe
+  */
+ 
+-#include <glib/gmem.h>
++#include <glib.h>
+ #include "opensync_list.h"
+ #include "opensync_internals.h"
+ 
diff --git a/devel/librcc/Makefile b/devel/librcc/Makefile
index ab2a8f6edc3b..47e5d355abfd 100644
--- a/devel/librcc/Makefile
+++ b/devel/librcc/Makefile
@@ -90,4 +90,8 @@ pre-everything::
 .endif
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
+		${WRKSRC}/external/rccexternal.c
+
 .include <bsd.port.mk>
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index 8bfb56ba5452..431b7d3b278e 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:   libsigc++2
-# Date created:        14 Feb 2004
-# Whom:                Alexander Nedotsukov <bland@FreeBSD.org>
-#
+# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/libsigc++20/Makefile,v 1.17 2011/07/25 09:19:14 kwm Exp $
-#
 
 PORTNAME=	libsigc++
 PORTVERSION=	2.2.10
@@ -22,7 +18,7 @@ USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 LATEST_LINK=	libsigc++20
 USE_LDCONFIG=	yes
-USE_GNOME=	gnomehack pkgconfig
+USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 
 PLIST_SUB=	VERSION="2.0" API_VERSION="2.0"
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index ed37b0d69ae3..7c097bad6d50 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	libsoup
-# Date created:				12 March 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/libsoup/Makefile,v 1.106 2011/07/28 19:00:08 kwm Exp $
-#
+#   $MCom: ports/devel/libsoup/Makefile,v 1.116 2013/01/15 02:25:57 kwm Exp $
 
 PORTNAME=	libsoup
-PORTVERSION=	2.34.3
+PORTVERSION=	2.40.3
 PORTREVISION?=	0
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
@@ -16,31 +12,29 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A SOAP (Simple Object Access Protocol) implementation in C
 
-USE_XZ=		yes
+BUILD_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt
+RUN_DEPENDS=	glib-networking>=2.29.18:${PORTSDIR}/net/glib-networking
 
-BUILD_DEPENDS=	glib-networking>=2.28.4:${PORTSDIR}/net/glib-networking
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	glib-networking>=2.28.4:${PORTSDIR}/net/glib-networking
+USE_XZ=		yes
 
 .if !defined(REFERENCE_PORT)
 
-USE_GNOME=	gnomehack glib20 libxml2 ltverhack referencehack
+USE_GETTEXT=	yes
+USE_GNOME=	gnomehier gnomehack glib20 libxml2 ltverhack referencehack \
+		intltool
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
-		--disable-gtk-doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_SUB=	VERSION="2.4"
 
-.include <bsd.port.pre.mk>
-
 .if defined(SOUP_SLAVE)
-LIB_DEPENDS+=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
-		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3
+USE_SQLITE=	yes
+LIB_DEPENDS+=	soup-2.4:${PORTSDIR}/devel/libsoup \
+		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 CONFIGURE_ARGS+=--with-gnome
 .else
 BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
@@ -73,6 +67,6 @@ post-install:
 	    	${PREFIX}/include/libsoup-2.4/libsoup/soup-connection.h
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
 
 .endif
diff --git a/devel/libsoup/distinfo b/devel/libsoup/distinfo
index 8849804ccbe4..4d489f751be9 100644
--- a/devel/libsoup/distinfo
+++ b/devel/libsoup/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libsoup-2.34.3.tar.xz) = c43f8865a9f7016c618b481bea3dd9ea65d9200685d4a94cddc54f8663704a1c
-SIZE (gnome2/libsoup-2.34.3.tar.xz) = 595916
+SHA256 (gnome2/libsoup-2.40.3.tar.xz) = 82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9
+SIZE (gnome2/libsoup-2.40.3.tar.xz) = 709124
diff --git a/devel/libsoup/files/patch-tests_coding-test.c b/devel/libsoup/files/patch-tests_coding-test.c
new file mode 100644
index 000000000000..899c799bc71d
--- /dev/null
+++ b/devel/libsoup/files/patch-tests_coding-test.c
@@ -0,0 +1,11 @@
+--- tests/coding-test.c.orig	2012-06-29 12:07:41.000000000 +0200
++++ tests/coding-test.c	2012-06-29 12:47:16.000000000 +0200
+@@ -66,7 +66,7 @@
+ 			}
+ 		}
+ 		if (file_path && encoding) {
+-			file = g_strdup_printf (file_path, path);
++			file = g_strdup_printf ("%s", path);
+ 			if (g_file_test (file, G_FILE_TEST_EXISTS)) {
+ 				soup_message_headers_append (msg->response_headers,
+ 							     "Content-Encoding",
diff --git a/devel/libsoup/pkg-plist b/devel/libsoup/pkg-plist
index 8b0a55444603..83bdbba6e77f 100644
--- a/devel/libsoup/pkg-plist
+++ b/devel/libsoup/pkg-plist
@@ -21,6 +21,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-message.h
 include/libsoup-%%VERSION%%/libsoup/soup-method.h
 include/libsoup-%%VERSION%%/libsoup/soup-misc.h
 include/libsoup-%%VERSION%%/libsoup/soup-multipart.h
+include/libsoup-%%VERSION%%/libsoup/soup-multipart-input-stream.h
 include/libsoup-%%VERSION%%/libsoup/soup-password-manager.h
 include/libsoup-%%VERSION%%/libsoup/soup-portability.h
 include/libsoup-%%VERSION%%/libsoup/soup-proxy-resolver.h
@@ -38,6 +39,7 @@ include/libsoup-%%VERSION%%/libsoup/soup-session-sync.h
 include/libsoup-%%VERSION%%/libsoup/soup-session.h
 include/libsoup-%%VERSION%%/libsoup/soup-socket.h
 include/libsoup-%%VERSION%%/libsoup/soup-status.h
+include/libsoup-%%VERSION%%/libsoup/soup-tld.h
 include/libsoup-%%VERSION%%/libsoup/soup-types.h
 include/libsoup-%%VERSION%%/libsoup/soup-uri.h
 include/libsoup-%%VERSION%%/libsoup/soup-value-utils.h
@@ -50,7 +52,131 @@ lib/libsoup-%%VERSION%%.so
 lib/libsoup-%%VERSION%%.so.1
 libdata/pkgconfig/libsoup-%%VERSION%%.pc
 share/gir-1.0/Soup-%%VERSION%%.gir
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupAddress.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuth.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomain.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainBasic.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupAuthDomainDigest.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupCache.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentDecoder.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupContentSniffer.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookie.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJar.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupCookieJarText.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupLogger.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessage.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageBody.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupMessageHeaders.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipart.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupMultipartInputStream.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyResolverDefault.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupProxyURIResolver.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequest.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestData.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestFile.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupRequestHTTP.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupServer.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupSession.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionAsync.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionFeature.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupSessionSync.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupSocket.html
+share/gtk-doc/html/libsoup-%%VERSION%%/SoupURI.html
+share/gtk-doc/html/libsoup-%%VERSION%%/annotation-glossary.html
+share/gtk-doc/html/libsoup-%%VERSION%%/ch01.html
+share/gtk-doc/html/libsoup-%%VERSION%%/ch02.html
+share/gtk-doc/html/libsoup-%%VERSION%%/ch03.html
+share/gtk-doc/html/libsoup-%%VERSION%%/ch04.html
+share/gtk-doc/html/libsoup-%%VERSION%%/ch05.html
+share/gtk-doc/html/libsoup-%%VERSION%%/ch06.html
+share/gtk-doc/html/libsoup-%%VERSION%%/ch07.html
+share/gtk-doc/html/libsoup-%%VERSION%%/home.png
+share/gtk-doc/html/libsoup-%%VERSION%%/index.html
+share/gtk-doc/html/libsoup-%%VERSION%%/index.sgml
+share/gtk-doc/html/libsoup-%%VERSION%%/ix01.html
+share/gtk-doc/html/libsoup-%%VERSION%%/left.png
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-GValue-Support.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-HTML-Form-Support.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Soup-Miscellaneous-Utilities.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupCookieJarSqlite.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-SoupRequester.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-Top-Level-Domain-utils.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-XMLRPC-Support.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-gnome-features.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-method.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%-soup-status.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-%%VERSION%%.devhelp2
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-build-howto.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-client-howto.html
+share/gtk-doc/html/libsoup-%%VERSION%%/libsoup-server-howto.html
+share/gtk-doc/html/libsoup-%%VERSION%%/right.png
+share/gtk-doc/html/libsoup-%%VERSION%%/style.css
+share/gtk-doc/html/libsoup-%%VERSION%%/up.png
+share/locale/as/LC_MESSAGES/libsoup.mo
+share/locale/be/LC_MESSAGES/libsoup.mo
+share/locale/bg/LC_MESSAGES/libsoup.mo
+share/locale/bn_IN/LC_MESSAGES/libsoup.mo
+share/locale/ca/LC_MESSAGES/libsoup.mo
+share/locale/ca@valencia/LC_MESSAGES/libsoup.mo
+share/locale/cs/LC_MESSAGES/libsoup.mo
+share/locale/da/LC_MESSAGES/libsoup.mo
+share/locale/de/LC_MESSAGES/libsoup.mo
+share/locale/el/LC_MESSAGES/libsoup.mo
+share/locale/en_GB/LC_MESSAGES/libsoup.mo
+share/locale/eo/LC_MESSAGES/libsoup.mo
+share/locale/es/LC_MESSAGES/libsoup.mo
+share/locale/et/LC_MESSAGES/libsoup.mo
+share/locale/fa/LC_MESSAGES/libsoup.mo
+share/locale/fr/LC_MESSAGES/libsoup.mo
+share/locale/fur/LC_MESSAGES/libsoup.mo
+share/locale/gl/LC_MESSAGES/libsoup.mo
+share/locale/gu/LC_MESSAGES/libsoup.mo
+share/locale/he/LC_MESSAGES/libsoup.mo
+share/locale/hi/LC_MESSAGES/libsoup.mo
+share/locale/hu/LC_MESSAGES/libsoup.mo
+share/locale/id/LC_MESSAGES/libsoup.mo
+share/locale/it/LC_MESSAGES/libsoup.mo
+share/locale/ja/LC_MESSAGES/libsoup.mo
+share/locale/kn/LC_MESSAGES/libsoup.mo
+share/locale/ko/LC_MESSAGES/libsoup.mo
+share/locale/lt/LC_MESSAGES/libsoup.mo
+share/locale/lv/LC_MESSAGES/libsoup.mo
+share/locale/ml/LC_MESSAGES/libsoup.mo
+share/locale/mr/LC_MESSAGES/libsoup.mo
+share/locale/nb/LC_MESSAGES/libsoup.mo
+share/locale/or/LC_MESSAGES/libsoup.mo
+share/locale/pa/LC_MESSAGES/libsoup.mo
+share/locale/pl/LC_MESSAGES/libsoup.mo
+share/locale/pt/LC_MESSAGES/libsoup.mo
+share/locale/pt_BR/LC_MESSAGES/libsoup.mo
+share/locale/ro/LC_MESSAGES/libsoup.mo
+share/locale/ru/LC_MESSAGES/libsoup.mo
+share/locale/sk/LC_MESSAGES/libsoup.mo
+share/locale/sl/LC_MESSAGES/libsoup.mo
+share/locale/sr/LC_MESSAGES/libsoup.mo
+share/locale/sr@latin/LC_MESSAGES/libsoup.mo
+share/locale/sv/LC_MESSAGES/libsoup.mo
+share/locale/ta/LC_MESSAGES/libsoup.mo
+share/locale/te/LC_MESSAGES/libsoup.mo
+share/locale/th/LC_MESSAGES/libsoup.mo
+share/locale/tr/LC_MESSAGES/libsoup.mo
+share/locale/ug/LC_MESSAGES/libsoup.mo
+share/locale/uk/LC_MESSAGES/libsoup.mo
+share/locale/uz@cyrillic/LC_MESSAGES/libsoup.mo
+share/locale/vi/LC_MESSAGES/libsoup.mo
+share/locale/zh_CN/LC_MESSAGES/libsoup.mo
+share/locale/zh_HK/LC_MESSAGES/libsoup.mo
+share/locale/zh_TW/LC_MESSAGES/libsoup.mo
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrm share/gtk-doc/html/libsoup-%%VERSION%%
+@dirrmtry share/gtk-doc/html
+@dirrmtry share/gtk-doc/
 @dirrm include/libsoup-%%VERSION%%/libsoup
 @dirrm include/libsoup-%%VERSION%%
-@dirrmtry lib/girepository-1.0
-@dirrmtry share/gir-1.0
diff --git a/devel/libvolume_id/Makefile b/devel/libvolume_id/Makefile
index c21747c1dbfa..4138583f9ced 100644
--- a/devel/libvolume_id/Makefile
+++ b/devel/libvolume_id/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	libvolume_id
-# Date created:		04 November 2006
-# Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libvolume_id
@@ -14,7 +11,6 @@ COMMENT=	Library to provide file system type information
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_LDCONFIG=	yes
 MAKE_ENV=	E=${ECHO_MSG} RANLIB=${RANLIB} AR=${AR} Q=@ \
 		prefix=${PREFIX}
diff --git a/devel/libwfut/Makefile b/devel/libwfut/Makefile
index 7e5ce021e66a..cca8077aa7c7 100644
--- a/devel/libwfut/Makefile
+++ b/devel/libwfut/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20 \
 CONFIGURE_ARGS+=--without-python
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 MAN1=		wfut.1
 
diff --git a/devel/lua-lgi/Makefile b/devel/lua-lgi/Makefile
index 76f2f5b8041c..8f1b5ef76e24 100644
--- a/devel/lua-lgi/Makefile
+++ b/devel/lua-lgi/Makefile
@@ -18,6 +18,7 @@ GH_ACCOUNT=	pavouk
 
 USE_LUA=	5.1+
 USE_GMAKE=	yes
+USE_PKGCONFIG=	build
 
 CPPFLAGS+=	-I${LOCALBASE}/include/${LUA_SUBDIR}
 
diff --git a/devel/ndesk-dbus-glib/Makefile b/devel/ndesk-dbus-glib/Makefile
index eb70eddcca8e..536ff969df41 100644
--- a/devel/ndesk-dbus-glib/Makefile
+++ b/devel/ndesk-dbus-glib/Makefile
@@ -19,6 +19,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/deve
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/ndesk-dbus-1.0.pc:${PORTSDIR}/devel/ndesk-dbus
 
 USE_GMAKE=	yes
+USE_PKGCONFIG=	build
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 
diff --git a/devel/ndesk-dbus/Makefile b/devel/ndesk-dbus/Makefile
index 9cf56d3868c9..bf640f9f542c 100644
--- a/devel/ndesk-dbus/Makefile
+++ b/devel/ndesk-dbus/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 
 DOCS=		AUTHORS COPYING README
diff --git a/devel/ndesk-options/Makefile b/devel/ndesk-options/Makefile
index b311c3d30b3d..18ce94082129 100644
--- a/devel/ndesk-options/Makefile
+++ b/devel/ndesk-options/Makefile
@@ -12,6 +12,7 @@ BUILD_DEPENDS=	mono:${PORTSDIR}/lang/mono
 RUN_DEPENDS=	mono:${PORTSDIR}/lang/mono
 
 GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
 USE_GMAKE=	yes
 
 post-patch:
diff --git a/devel/obby/Makefile b/devel/obby/Makefile
index f1872186aab8..3526e561980e 100644
--- a/devel/obby/Makefile
+++ b/devel/obby/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
 		net6:${PORTSDIR}/net/net6
 
 USE_GNOME=	gnomehack
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/devel/orbitcpp/Makefile b/devel/orbitcpp/Makefile
index c23e7d730d2b..1f3a09966153 100644
--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@@ -16,6 +16,7 @@ COMMENT=	C++ bindings for ORBit, a CORBA 2.2-compliant ORB
 
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack ltverhack orbit2
+USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/ptlib26/Makefile b/devel/ptlib26/Makefile
index dc7d641d42cd..7760b5b6926e 100644
--- a/devel/ptlib26/Makefile
+++ b/devel/ptlib26/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pwlib
-# Date created:		Fri Aug 22 07:11:44 GMT 2003
-# Whom:			Roger Hardiman <roger@freebsd.org>
-#
+# Created by: Roger Hardiman <roger@freebsd.org>
 # $FreeBSD$
-#
 
 PORTNAME=	ptlib
 PORTVERSION=	2.6.7
@@ -25,7 +21,6 @@ USE_BZIP2=	yes
 USE_BISON=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
 WANT_GNOME=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index df2b1df71cbe..e2d7c0334c09 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -1,10 +1,10 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/py-gobject/Makefile,v 1.52 2011/06/13 20:37:47 kwm Exp $
+#   $MCom: ports/devel/py-gobject/Makefile,v 1.58 2012/12/30 18:15:16 mezz Exp $
 
 PORTNAME=	gobject
 PORTVERSION=	2.28.6
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -30,7 +30,7 @@ USE_PYTHON=	2.5+
 USE_PKGCONFIG=	build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--disable-docs
+CONFIGURE_ARGS=	--disable-docs --disable-introspection
 
 CONFLICTS=	py*-gtk-0*
 PLIST_SUB=	PYTHON_VER="${PYTHON_VER}"
diff --git a/devel/py-gobject/files/patch-gi_pygi-info.c b/devel/py-gobject/files/patch-gi_pygi-info.c
new file mode 100644
index 000000000000..75ab80f5a515
--- /dev/null
+++ b/devel/py-gobject/files/patch-gi_pygi-info.c
@@ -0,0 +1,28 @@
+--- gi/pygi-info.c.orig	2011-09-17 10:24:16.000000000 +0200
++++ gi/pygi-info.c	2011-09-17 10:24:40.000000000 +0200
+@@ -162,9 +162,6 @@ _pygi_info_new (GIBaseInfo *info)
+         case GI_INFO_TYPE_CONSTANT:
+             type = &PyGIConstantInfo_Type;
+             break;
+-        case GI_INFO_TYPE_ERROR_DOMAIN:
+-            type = &PyGIErrorDomainInfo_Type;
+-            break;
+         case GI_INFO_TYPE_UNION:
+             type = &PyGIUnionInfo_Type;
+             break;
+@@ -481,7 +478,6 @@ _pygi_g_type_info_size (GITypeInfo *type
+                 case GI_INFO_TYPE_INVALID:
+                 case GI_INFO_TYPE_FUNCTION:
+                 case GI_INFO_TYPE_CONSTANT:
+-                case GI_INFO_TYPE_ERROR_DOMAIN:
+                 case GI_INFO_TYPE_VALUE:
+                 case GI_INFO_TYPE_SIGNAL:
+                 case GI_INFO_TYPE_PROPERTY:
+@@ -860,7 +856,6 @@ pygi_g_struct_info_is_simple (GIStructIn
+                     case GI_INFO_TYPE_INVALID:
+                     case GI_INFO_TYPE_FUNCTION:
+                     case GI_INFO_TYPE_CONSTANT:
+-                    case GI_INFO_TYPE_ERROR_DOMAIN:
+                     case GI_INFO_TYPE_VALUE:
+                     case GI_INFO_TYPE_SIGNAL:
+                     case GI_INFO_TYPE_PROPERTY:
diff --git a/devel/py-gobject/pkg-plist b/devel/py-gobject/pkg-plist
index 5e9d89382561..771874406c0d 100644
--- a/devel/py-gobject/pkg-plist
+++ b/devel/py-gobject/pkg-plist
@@ -4,49 +4,6 @@ include/pygtk-2.0/pygobject.h
 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%%/gi/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/_gi.la
-%%PYTHON_SITELIBDIR%%/gi/_gi.so
-%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.la
-%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so
-%%PYTHON_SITELIBDIR%%/gi/importer.py
-%%PYTHON_SITELIBDIR%%/gi/importer.pyc
-%%PYTHON_SITELIBDIR%%/gi/importer.pyo
-%%PYTHON_SITELIBDIR%%/gi/module.py
-%%PYTHON_SITELIBDIR%%/gi/module.pyc
-%%PYTHON_SITELIBDIR%%/gi/module.pyo
-%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyo
-%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyo
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyo
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyo
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyo
-%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyo
-%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py
-%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyc
-%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyo
-%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py
-%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyc
-%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gi/types.py
-%%PYTHON_SITELIBDIR%%/gi/types.pyc
-%%PYTHON_SITELIBDIR%%/gi/types.pyo
 %%PYTHON_SITELIBDIR%%/glib/__init__.py
 %%PYTHON_SITELIBDIR%%/glib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/glib/__init__.pyo
@@ -66,9 +23,6 @@ lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gobject/propertyhelper.py
 %%PYTHON_SITELIBDIR%%/gobject/propertyhelper.pyc
 %%PYTHON_SITELIBDIR%%/gobject/propertyhelper.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
-%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.py
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyc
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/__init__.pyo
@@ -76,6 +30,9 @@ lib/libpyglib-2.0-python%%PYTHON_VER%%.so.0
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/_gio.so
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.la
 %%PYTHON_SITELIBDIR%%/gtk-2.0/gio/unix.so
+%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.py
+%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyc
+%%PYTHON_SITELIBDIR%%/gtk-2.0/dsextras.pyo
 %%PYTHON_SITELIBDIR%%/pygtk.pth
 %%PYTHON_SITELIBDIR%%/pygtk.py
 %%PYTHON_SITELIBDIR%%/pygtk.pyc
@@ -228,11 +185,8 @@ share/pygobject/xsl/ref-html-style.xsl
 @dirrm share/pygobject/2.0
 @dirrm share/pygobject
 @dirrm share/doc/pygobject
-@dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gio
+@dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0/gio
 @dirrmtry %%PYTHON_SITELIBDIR%%/gtk-2.0
-@dirrm %%PYTHON_SITELIBDIR%%/gobject
-@dirrm %%PYTHON_SITELIBDIR%%/glib
-@dirrm %%PYTHON_SITELIBDIR%%/gi/repository
-@dirrm %%PYTHON_SITELIBDIR%%/gi/overrides
-@dirrm %%PYTHON_SITELIBDIR%%/gi
-@dirrmtry include/pygtk-2.0
+@dirrmtry %%PYTHON_SITELIBDIR%%/gobject
+@dirrmtry %%PYTHON_SITELIBDIR%%/glib
+@dirrm include/pygtk-2.0
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index c54a411af6ab..75a54dc9e209 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	py-orbit2
-# Date created:				04 March 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/devel/py-orbit/Makefile,v 1.1 2008/09/23 20:08:04 mezz Exp $
-#
 
 PORTNAME=	orbit
 PORTVERSION=	2.24.0
@@ -23,6 +19,7 @@ CONFLICTS=	py*-omniorb-[0-9]*
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack orbit2
+USE_PKGCONFIG=	build
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 ORBIT_CONFIG=	${LOCALBASE}/bin/orbit2-config
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index a33d8ee8b6e6..e550c5cd846c 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -13,6 +13,7 @@ COMMENT=	Qt core library
 LIB_DEPENDS=	icui18n:${PORTSDIR}/devel/icu
 
 USE_GNOME=	_glib20
+USE_PKGCONFIG=	build
 USE_QT4=	qmake_build moc_build
 QT_NONSTANDARD=	yes
 QT_DIST=	yes
diff --git a/devel/regexxer/Makefile b/devel/regexxer/Makefile
index 45d74fe37292..7f64c07313d5 100644
--- a/devel/regexxer/Makefile
+++ b/devel/regexxer/Makefile
@@ -32,4 +32,8 @@ INSTALLS_ICONS=		regexxer.png
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${GREP} regexxer) > temp-pkg-plist
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
+		${WRKSRC}/src/globalstrings.h ${WRKSRC}/src/translation.h
+
 .include <bsd.port.mk>
diff --git a/devel/seed/Makefile b/devel/seed/Makefile
index bbd6152c5f2e..54ee5bfe655e 100644
--- a/devel/seed/Makefile
+++ b/devel/seed/Makefile
@@ -1,17 +1,12 @@
-# New ports collection makefile for:	seed
-# Date created:				19 July 2009
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/seed/Makefile,v 1.24 2010/09/19 15:06:42 kwm Exp $
-#
+#   $MCom: ports/devel/seed/Makefile,v 1.35 2013/01/29 16:33:10 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.
-#
 
 PORTNAME=	seed
 PORTVERSION=	2.31.91
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -21,11 +16,12 @@ COMMENT=	GObject JavaScriptCore bridge
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-js-common.pc:${PORTSDIR}/devel/gnome-js-common
 LIB_DEPENDS=	ffi:${PORTSDIR}/devel/libffi \
-		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2 \
-		girepository-1.0.1:${PORTSDIR}/devel/gobject-introspection \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		mpfr.4:${PORTSDIR}/math/mpfr
+		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \
+		girepository-1.0:${PORTSDIR}/devel/gobject-introspection \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
+		mpfr:${PORTSDIR}/math/mpfr
+
+CONFLICTS=	seed-3.[0-9]*
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
@@ -33,6 +29,7 @@ USE_GETTEXT=	yes
 USE_GNOME=	gnomehack gtk20 intltool libxml2
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
+USE_SQLITE=	yes
 USE_GMAKE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/devel/seed/files/patch-libseed_seed-gtype.c b/devel/seed/files/patch-libseed_seed-gtype.c
new file mode 100644
index 000000000000..b9755d5e1b4d
--- /dev/null
+++ b/devel/seed/files/patch-libseed_seed-gtype.c
@@ -0,0 +1,12 @@
+--- libseed/seed-gtype.c.orig	2010-08-30 21:37:38.000000000 +0000
++++ libseed/seed-gtype.c	2012-02-07 15:33:05.000000000 +0000
+@@ -1032,9 +1032,6 @@
+ 
+   proto = seed_struct_prototype (ctx, objectclass_info);
+ 
+-  paramspec_info = g_irepository_find_by_name (NULL, "GObject", "ParamSpec");
+-  proto = seed_struct_prototype (ctx, paramspec_info);
+-
+   seed_create_function (ctx, "get", &seed_param_getter_invoked, proto);
+   seed_create_function (ctx, "set", &seed_param_setter_invoked, proto);
+ }
diff --git a/devel/valide/Makefile b/devel/valide/Makefile
index d6d52878f82c..f42d6b68e3ce 100644
--- a/devel/valide/Makefile
+++ b/devel/valide/Makefile
@@ -18,6 +18,8 @@ LIB_DEPENDS=	gdl-1:${PORTSDIR}/x11-toolkits/gdl
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+BROKEN=		Doesn't build with vala 0.12+
+
 INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
 USE_GNOME=	gtk20 gtksourceview2
diff --git a/devel/varconf/Makefile b/devel/varconf/Makefile
index 447bc765bad8..ec7fa6288bf5 100644
--- a/devel/varconf/Makefile
+++ b/devel/varconf/Makefile
@@ -14,6 +14,7 @@ LIB_DEPENDS=	sigc-2.0:${PORTSDIR}/devel/libsigc++20
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack
+USE_PKGCONFIG=	build
 USE_LDCONFIG=	yes
 
 .include <bsd.port.options.mk>
diff --git a/devel/vtg/Makefile b/devel/vtg/Makefile
index cf42f69795f9..8070f6b94eb5 100644
--- a/devel/vtg/Makefile
+++ b/devel/vtg/Makefile
@@ -20,6 +20,8 @@ COMMENT=	Vala Toys for gEdit
 BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
 RUN_DEPENDS=	valac:${PORTSDIR}/lang/vala
 
+IGNORE=		doesn't build with vala 0.18+
+
 CONFIGURE_ARGS=	--disable-vtg-plugin --disable-gen-project
 CPPFLAGS=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile
index 4a6d794918c0..a13614f3bf0c 100644
--- a/devel/xfce4-dev-tools/Makefile
+++ b/devel/xfce4-dev-tools/Makefile
@@ -20,5 +20,6 @@ GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_XFCE=	configenv	# to get MASTER_SITE_SUBDIR something has to be defined
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 
 .include <bsd.port.mk>
author	Koop Mast <kwm@FreeBSD.org>	2013-03-08 10:51:34 +0000
committer	Koop Mast <kwm@FreeBSD.org>	2013-03-08 10:51:34 +0000
commit	7887c684adab042fed1bfcba2e91589ecd17c4a8 (patch)
tree	961839899dce7f75292a08c079f548973bdbd40d /devel
parent	85544f2c01be814e0af1ebee1076012e7ed60bb0 (diff)