Update to 2.6.0.

Use new Makefile header format.


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

8 files changed, 27 insertions, 152 deletions

diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index 2d10664aa..00589f5bf 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   at-spi
-# Date Created:			12 April 2002
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.35 2011/11/19 10:15:09 kwm Exp $
-#
+#   $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.36 2012/05/31 11:24:18 kwm Exp $
 
 PORTNAME=	at-spi2-atk
-PORTVERSION=	2.4.0
+PORTVERSION=	2.6.0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,20 +12,18 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Assisted Technology Provider module for GTK+
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
-		${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+BUILD_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
 
 CONFLICTS=	at-spi-1.[0-9]*
 
 USE_XZ=		yes
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomehier intlhack libxml2 atk
+USE_GNOME=	gnomehack gnomehier intlhack glib20 atk
 GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 GLIB_SCHEMAS=	org.a11y.atspi.gschema.xml
diff --git a/accessibility/at-spi2-atk/distinfo b/accessibility/at-spi2-atk/distinfo
index 9d0e999a8..a3545e929 100644
--- a/accessibility/at-spi2-atk/distinfo
+++ b/accessibility/at-spi2-atk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/at-spi2-atk-2.4.0.tar.xz) = 28e9c21ec8a76cae4914bdbc011c4f6bf1beeaa27751a88534d87364e6a888bf
-SIZE (gnome3/at-spi2-atk-2.4.0.tar.xz) = 303684
+SHA256 (gnome3/at-spi2-atk-2.6.0.tar.xz) = 2cfcb5e29aa6db5e8982add072dffecadd81d6ef04845afa2336be1b515bdc1f
+SIZE (gnome3/at-spi2-atk-2.6.0.tar.xz) = 274760
diff --git a/accessibility/at-spi2-atk/pkg-plist b/accessibility/at-spi2-atk/pkg-plist
index f13090b99..1085e7997 100644
--- a/accessibility/at-spi2-atk/pkg-plist
+++ b/accessibility/at-spi2-atk/pkg-plist
@@ -1,108 +1,14 @@
+include/at-spi2-atk/2.0/atk-bridge.h
+lib/libatk-bridge-2.0.la
+lib/libatk-bridge-2.0.so
+lib/libatk-bridge-2.0.so.0
 lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
 lib/gtk-2.0/modules/libatk-bridge.la
 lib/gtk-2.0/modules/libatk-bridge.so
-lib/gtk-3.0/modules/libatk-bridge.la
-lib/gtk-3.0/modules/libatk-bridge.so
-share/locale/an/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ar/LC_MESSAGES/at-spi2-atk.mo
-share/locale/as/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ast/LC_MESSAGES/at-spi2-atk.mo
-share/locale/be/LC_MESSAGES/at-spi2-atk.mo
-share/locale/bg/LC_MESSAGES/at-spi2-atk.mo
-share/locale/bn/LC_MESSAGES/at-spi2-atk.mo
-share/locale/bn_IN/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ca/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ca@valencia/LC_MESSAGES/at-spi2-atk.mo
-share/locale/cs/LC_MESSAGES/at-spi2-atk.mo
-share/locale/cy/LC_MESSAGES/at-spi2-atk.mo
-share/locale/da/LC_MESSAGES/at-spi2-atk.mo
-share/locale/de/LC_MESSAGES/at-spi2-atk.mo
-share/locale/el/LC_MESSAGES/at-spi2-atk.mo
-share/locale/en@shaw/LC_MESSAGES/at-spi2-atk.mo
-share/locale/en_CA/LC_MESSAGES/at-spi2-atk.mo
-share/locale/en_GB/LC_MESSAGES/at-spi2-atk.mo
-share/locale/eo/LC_MESSAGES/at-spi2-atk.mo
-share/locale/es/LC_MESSAGES/at-spi2-atk.mo
-share/locale/et/LC_MESSAGES/at-spi2-atk.mo
-share/locale/eu/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fa/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fi/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fy/LC_MESSAGES/at-spi2-atk.mo
-share/locale/gl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/gu/LC_MESSAGES/at-spi2-atk.mo
-share/locale/he/LC_MESSAGES/at-spi2-atk.mo
-share/locale/hi/LC_MESSAGES/at-spi2-atk.mo
-share/locale/hu/LC_MESSAGES/at-spi2-atk.mo
-share/locale/id/LC_MESSAGES/at-spi2-atk.mo
-share/locale/it/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ja/LC_MESSAGES/at-spi2-atk.mo
-share/locale/km/LC_MESSAGES/at-spi2-atk.mo
-share/locale/kn/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ko/LC_MESSAGES/at-spi2-atk.mo
-share/locale/lt/LC_MESSAGES/at-spi2-atk.mo
-share/locale/lv/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ml/LC_MESSAGES/at-spi2-atk.mo
-share/locale/mr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ms/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nb/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nn/LC_MESSAGES/at-spi2-atk.mo
-share/locale/or/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pa/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pt/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pt_BR/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ro/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ru/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sk/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sq/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sr@latin/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sv/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ta/LC_MESSAGES/at-spi2-atk.mo
-share/locale/te/LC_MESSAGES/at-spi2-atk.mo
-share/locale/th/LC_MESSAGES/at-spi2-atk.mo
-share/locale/tr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ug/LC_MESSAGES/at-spi2-atk.mo
-share/locale/uk/LC_MESSAGES/at-spi2-atk.mo
-share/locale/uz@cyrillic/LC_MESSAGES/at-spi2-atk.mo
-share/locale/vi/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_CN/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_HK/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_TW/LC_MESSAGES/at-spi2-atk.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@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/sr@latin/LC_MESSAGES
-@dirrmtry share/locale/sr@latin
-@dirrmtry share/locale/or/LC_MESSAGES
-@dirrmtry share/locale/or
-@dirrmtry share/locale/mr/LC_MESSAGES
-@dirrmtry share/locale/mr
-@dirrmtry share/locale/km/LC_MESSAGES
-@dirrmtry share/locale/km
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy
-@dirrmtry share/locale/en@shaw/LC_MESSAGES
-@dirrmtry share/locale/en@shaw
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia
-@dirrmtry share/locale/bn_IN/LC_MESSAGES
-@dirrmtry share/locale/bn_IN
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/as/LC_MESSAGES
-@dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
-@dirrmtry lib/gtk-3.0/modules
-@dirrmtry lib/gtk-3.0
+libdata/pkgconfig/atk-bridge-2.0.pc
 @dirrmtry lib/gtk-2.0/modules
 @dirrmtry lib/gtk-2.0
 @dirrmtry lib/gnome-settings-daemon-3.0/gtk-modules
 @dirrmtry lib/gnome-settings-daemon-3.0
+@dirrm include/at-spi2-atk/2.0
+@dirrm include/at-spi2-atk
diff --git a/accessibility/at-spi2-core/Makefile b/accessibility/at-spi2-core/Makefile
index c7fb3daa1..46ea6c156 100644
--- a/accessibility/at-spi2-core/Makefile
+++ b/accessibility/at-spi2-core/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   at-spi
-# Date Created:			12 April 2002
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.38 2011/11/23 09:51:59 kwm Exp $
-#
+#   $MCom: ports/accessibility/at-spi2-core/Makefile,v 1.39 2012/05/31 11:18:19 kwm Exp $
 
 PORTNAME=	at-spi2-core
-PORTVERSION=	2.4.2
+PORTVERSION=	2.6.0
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,10 +12,9 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An Assistive Technology Service Provider Interface
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
 USE_XZ=		yes
 USE_GETTEXT=	yes
diff --git a/accessibility/at-spi2-core/distinfo b/accessibility/at-spi2-core/distinfo
index 4fef3ea85..9075c0fba 100644
--- a/accessibility/at-spi2-core/distinfo
+++ b/accessibility/at-spi2-core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/at-spi2-core-2.4.2.tar.xz) = 61d926ffc49c7f9236580468c5c9dabda16cec37ef3aee78ca6f2751595518fd
-SIZE (gnome3/at-spi2-core-2.4.2.tar.xz) = 441204
+SHA256 (gnome3/at-spi2-core-2.6.0.tar.xz) = 8d7e685c7cda6e2831b31c66ec796dc344c5eb29d8311f69b0a47529194ec559
+SIZE (gnome3/at-spi2-core-2.6.0.tar.xz) = 443552
diff --git a/accessibility/at-spi2-core/files/patch-registeryd_deviceeventcontroller.c b/accessibility/at-spi2-core/files/patch-registeryd_deviceeventcontroller.c
deleted file mode 100644
index a21891966..000000000
--- a/accessibility/at-spi2-core/files/patch-registeryd_deviceeventcontroller.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- registryd/deviceeventcontroller.c.orig	2012-06-29 10:32:08.000000000 +0200
-+++ registryd/deviceeventcontroller.c	2012-06-29 10:33:19.000000000 +0200
-@@ -1225,11 +1225,11 @@
-                                                 "org.freedesktop.DBus.Peer",
-                                                 "Ping");
-         if (!message)
--          return;
-+          return NULL;
-         dbus_connection_send_with_reply (bus, message, &pending, -1);
-         dbus_message_unref (message);
-         if (!pending)
--          return;
-+          return NULL;
-         bus_name_dup = g_strdup (dest);
-         dbus_pending_call_set_notify (pending, reset_hung_process_from_ping,
-                                       bus_name_dup, NULL);
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 686920639..5a4081de0 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	atk
-# Date Created:				14 May 2001
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/atk/Makefile,v 1.121 2012/08/17 19:06:42 kwm Exp $
-#
+#   $MCom: ports/accessibility/atk/Makefile,v 1.122 2012/08/19 16:06:29 kwm Exp $
 
 PORTNAME=	atk
-PORTVERSION=	2.4.0
+PORTVERSION=	2.6.0
 PORTREVISION?=	0
 CATEGORIES=	accessibility devel
 MASTER_SITES=	GNOME
diff --git a/accessibility/atk/distinfo b/accessibility/atk/distinfo
index 6a7626fb5..b987ddc33 100644
--- a/accessibility/atk/distinfo
+++ b/accessibility/atk/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/atk-2.4.0.tar.xz) = 091e9ce975a9fbbc7cd8fa64c9c389ffb7fa6cdde58b6d5c01b2c267093d888d
-SIZE (gnome2/atk-2.4.0.tar.xz) = 607156
+SHA256 (gnome2/atk-2.6.0.tar.xz) = eff663f90847620bb68c9c2cbaaf7f45e2ff44163b9ab3f10d15be763680491f
+SIZE (gnome2/atk-2.6.0.tar.xz) = 609136