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

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

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

6 files changed, 13 insertions, 14 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 96281ffbecf1..37e5a08739bc 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	evolution-data-server
-# Date created:				09 December 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 #   $MCom: ports/databases/evolution-data-server/Makefile,v 1.203 2010/11/15 17:19:55 kwm Exp $
-#
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	2.32.1
@@ -16,14 +12,14 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The data backends for the Evolution integrated mail/PIM suite
 
-LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
+LIB_DEPENDS=	soup-2.4:${PORTSDIR}/devel/libsoup \
 		gdata.7:${PORTSDIR}/devel/libgdata \
-		dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
 		ical:${PORTSDIR}/devel/libical \
-		nss3.1:${PORTSDIR}/security/nss \
-		tasn1.5:${PORTSDIR}/security/libtasn1 \
-		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
+		nss3:${PORTSDIR}/security/nss \
+		tasn1:${PORTSDIR}/security/libtasn1 \
+		sqlite3:${PORTSDIR}/databases/sqlite3 \
+		gnome-keyring:${PORTSDIR}/security/libgnome-keyring
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -82,6 +78,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
 		s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
 		s|-DGTK_DISABLE_DEPRECATED||g ; \
+		s|-DG_DISABLE_DEPRECATED||g ; \
 		s|-Wl,--no-undefined||g ; \
 		s|-Wmissing-include-dirs||g' \
 			${WRKSRC}/configure
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index c5a1b13f8a8f..d90bda2d32f1 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -36,7 +36,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-bdb
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
 
 MAN1=		gda-config-tool.1
 MAN5=		gda-config.5
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 228c37759142..1c6c0014e761 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -34,7 +34,7 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-bdb --without-sybase
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
 
 .include <bsd.port.pre.mk>
 
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 80fe50a71fe4..d0a6b6d19269 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -28,7 +28,7 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include -DGLIB_COMPILATION
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 GCONF_SCHEMAS=	libgnomedb-3.0.schemas
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index a1339a252351..3f49b686dc32 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -20,6 +20,7 @@ BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk
 USE_AUTOTOOLS=	libtool
 USE_BISON=	build
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/databases/mydumper/Makefile b/databases/mydumper/Makefile
index cb50dd57e590..edc7167ac680 100644
--- a/databases/mydumper/Makefile
+++ b/databases/mydumper/Makefile
@@ -19,6 +19,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}
 FETCH_ARGS?=	-pRr
 PLIST_FILES=	sbin/mydumper sbin/myloader
 USE_GNOME=	glib20
+USE_PKGCONFIG=	build
 USE_MYSQL=	yes
 USE_CMAKE=	yes