* 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

3 files changed, 16 insertions, 14 deletions

diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index f1b57e52e3b5..bdecb6bfa26f 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -1,9 +1,9 @@
 # Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.114 2011/06/13 20:32:27 kwm Exp $
+#   $MCom: ports/accessibility/atk/Makefile,v 1.123 2012/10/07 09:00:37 kwm Exp $
 
 PORTNAME=	atk
-PORTVERSION=	2.0.1
+PORTVERSION=	2.6.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	GNOME
@@ -22,16 +22,16 @@ USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack glib20 ltverhack referencehack
+USE_GNOME=	gnomehier gnomehack glib20 ltverhack referencehack
+USE_PKGCONFIG=	build
 CONFIGURE_ARGS=	--enable-static \
-		--disable-gtk-doc \
 		--with-html-dir=${PREFIX}/share/doc
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	AUTOCONF=${TRUE} AUTOMAKE=${TRUE}
 
 post-patch:
-	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests//" \
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/tests docs//" \
 		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 2b2e3c1a3b4f..b987ddc3379e 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/atk-2.0.1.tar.xz) = 4588867bb9eb788b2cf3399d3a2d5e4898193a9027436f6cffc9c18a627452a1
-SIZE (gnome2/atk-2.0.1.tar.xz) = 586516
+SHA256 (gnome2/atk-2.6.0.tar.xz) = eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f
+SIZE (gnome2/atk-2.6.0.tar.xz) = 609136
diff --git a/accessibility/atk/pkg-plist b/accessibility/atk/pkg-plist
index bb957f46ffbe..5b6cf77cd359 100644
--- a/accessibility/atk/pkg-plist
+++ b/accessibility/atk/pkg-plist
@@ -28,6 +28,7 @@ include/atk-1.0/atk/atktable.h
 include/atk-1.0/atk/atktext.h
 include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
+include/atk-1.0/atk/atkwindow.h
 lib/girepository-1.0/Atk-1.0.typelib
 lib/libatk-1.0.a
 lib/libatk-1.0.la
@@ -55,9 +56,9 @@ share/locale/da/LC_MESSAGES/atk10.mo
 share/locale/de/LC_MESSAGES/atk10.mo
 share/locale/dz/LC_MESSAGES/atk10.mo
 share/locale/el/LC_MESSAGES/atk10.mo
+share/locale/en@shaw/LC_MESSAGES/atk10.mo
 share/locale/en_CA/LC_MESSAGES/atk10.mo
 share/locale/en_GB/LC_MESSAGES/atk10.mo
-share/locale/en@shaw/LC_MESSAGES/atk10.mo
 share/locale/eo/LC_MESSAGES/atk10.mo
 share/locale/es/LC_MESSAGES/atk10.mo
 share/locale/et/LC_MESSAGES/atk10.mo
@@ -79,6 +80,7 @@ share/locale/it/LC_MESSAGES/atk10.mo
 share/locale/ja/LC_MESSAGES/atk10.mo
 share/locale/ka/LC_MESSAGES/atk10.mo
 share/locale/kk/LC_MESSAGES/atk10.mo
+share/locale/km/LC_MESSAGES/atk10.mo
 share/locale/kn/LC_MESSAGES/atk10.mo
 share/locale/ko/LC_MESSAGES/atk10.mo
 share/locale/ku/LC_MESSAGES/atk10.mo
@@ -99,9 +101,9 @@ share/locale/oc/LC_MESSAGES/atk10.mo
 share/locale/or/LC_MESSAGES/atk10.mo
 share/locale/pa/LC_MESSAGES/atk10.mo
 share/locale/pl/LC_MESSAGES/atk10.mo
+share/locale/ps/LC_MESSAGES/atk10.mo
 share/locale/pt/LC_MESSAGES/atk10.mo
 share/locale/pt_BR/LC_MESSAGES/atk10.mo
-share/locale/ps/LC_MESSAGES/atk10.mo
 share/locale/ro/LC_MESSAGES/atk10.mo
 share/locale/ru/LC_MESSAGES/atk10.mo
 share/locale/rw/LC_MESSAGES/atk10.mo
@@ -110,8 +112,8 @@ share/locale/sk/LC_MESSAGES/atk10.mo
 share/locale/sl/LC_MESSAGES/atk10.mo
 share/locale/sq/LC_MESSAGES/atk10.mo
 share/locale/sr/LC_MESSAGES/atk10.mo
-share/locale/sr@latin/LC_MESSAGES/atk10.mo
 share/locale/sr@ije/LC_MESSAGES/atk10.mo
+share/locale/sr@latin/LC_MESSAGES/atk10.mo
 share/locale/sv/LC_MESSAGES/atk10.mo
 share/locale/ta/LC_MESSAGES/atk10.mo
 share/locale/te/LC_MESSAGES/atk10.mo
@@ -129,10 +131,6 @@ share/locale/zh_CN/LC_MESSAGES/atk10.mo
 share/locale/zh_HK/LC_MESSAGES/atk10.mo
 share/locale/zh_TW/LC_MESSAGES/atk10.mo
 share/locale/zu/LC_MESSAGES/atk10.mo
-@dirrm include/atk-1.0/atk
-@dirrm include/atk-1.0
-@dirrmtry share/gir-1.0
-@dirrmtry lib/girepository-1.0
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -165,6 +163,8 @@ share/locale/zu/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/hy/LC_MESSAGES
@@ -183,3 +183,5 @@ share/locale/zu/LC_MESSAGES/atk10.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrm include/atk-1.0/atk
+@dirrm include/atk-1.0