Add CONFLICTS with the each others.

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

6 files changed, 315 insertions, 1 deletions

diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
new file mode 100644
index 000000000..1f5fd5fd9
--- /dev/null
+++ b/accessibility/at-spi/Makefile
@@ -0,0 +1,47 @@
+# New ports collection makefile for:   at-spi
+# Date Created:			12 April 2002
+# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
+#
+# $FreeBSD: ports/accessibility/at-spi/Makefile,v 1.75 2010/11/20 15:36:23 kwm Exp $
+#   $MCom: ports/accessibility/at-spi/Makefile,v 1.103 2010/09/27 09:47:42 kwm Exp $
+#
+
+PORTNAME=	at-spi
+PORTVERSION=	1.32.0
+PORTREVISION?=	0
+CATEGORIES=	accessibility x11-toolkits
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	An Assistive Technology Service Provider Interface
+
+USE_BZIP2=	yes
+
+.if !defined(REFERENCE_PORT)
+
+CONFLICTS=	at-spi2-atk-2.[0-9]*
+
+USE_GETTEXT=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gnomehier intlhack gtk20 gconf2 libbonobo
+USE_XORG=	x11 xtst
+USE_PYTHON=	yes
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-static
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+GCONF_SCHEMAS=	at-spi.schemas
+
+post-extract:
+	@${RM} -f ${WRKSRC}/registryd/Accessibility_Registry.server
+
+post-patch:
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/docs//" ${WRKSRC}/Makefile.in
+
+.include <bsd.port.mk>
+
+.endif
diff --git a/accessibility/at-spi/distinfo b/accessibility/at-spi/distinfo
new file mode 100644
index 000000000..8196f8863
--- /dev/null
+++ b/accessibility/at-spi/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/at-spi-1.32.0.tar.bz2) = cc841dea746413eebadf0710dabec741450b37a06821c34526f505fe9d027039
+SIZE (gnome2/at-spi-1.32.0.tar.bz2) = 845788
diff --git a/accessibility/at-spi/files/patch-registryd_registry-main.c b/accessibility/at-spi/files/patch-registryd_registry-main.c
new file mode 100644
index 000000000..ac903d9f4
--- /dev/null
+++ b/accessibility/at-spi/files/patch-registryd_registry-main.c
@@ -0,0 +1,10 @@
+--- registryd/registry-main.c.orig	2010-02-27 00:19:33.000000000 -0500
++++ registryd/registry-main.c	2010-02-27 00:21:10.000000000 -0500
+@@ -198,6 +198,7 @@ main (int argc, char **argv)
+    * has been set.  If we have not been relocated, we will exit if the
+    * at-spi-dbus key has been set.
+    */
++  g_type_init ();
+   gconf_client = gconf_client_get_default ();
+ #ifdef RELOCATE
+   need_to_quit = !gconf_client_get_bool (gconf_client, CORBA_GCONF_KEY, NULL);
diff --git a/accessibility/at-spi/pkg-descr b/accessibility/at-spi/pkg-descr
new file mode 100644
index 000000000..c832f3ba9
--- /dev/null
+++ b/accessibility/at-spi/pkg-descr
@@ -0,0 +1,6 @@
+This is the Gnome Accessibility Project's Assistive Technology
+Service Provider Interface.  It allows accessibility applications
+and assistive technologies to announce their respective existence
+to each other.
+
+WWW: http://developer.gnome.org/projects/gap/
diff --git a/accessibility/at-spi/pkg-plist b/accessibility/at-spi/pkg-plist
new file mode 100644
index 000000000..9d5f86967
--- /dev/null
+++ b/accessibility/at-spi/pkg-plist
@@ -0,0 +1,247 @@
+etc/xdg/autostart/at-spi-registryd.desktop
+include/at-spi-1.0/cspi/spi-impl.h
+include/at-spi-1.0/cspi/spi-listener.h
+include/at-spi-1.0/cspi/spi-roletypes.h
+include/at-spi-1.0/cspi/spi-statetypes.h
+include/at-spi-1.0/cspi/spi.h
+include/at-spi-1.0/libspi/Accessibility.h
+include/at-spi-1.0/libspi/accessible.h
+include/at-spi-1.0/libspi/action.h
+include/at-spi-1.0/libspi/application.h
+include/at-spi-1.0/libspi/base.h
+include/at-spi-1.0/libspi/collection.h
+include/at-spi-1.0/libspi/component.h
+include/at-spi-1.0/libspi/devicelistener.h
+include/at-spi-1.0/libspi/document.h
+include/at-spi-1.0/libspi/editabletext.h
+include/at-spi-1.0/libspi/eventlistener.h
+include/at-spi-1.0/libspi/hyperlink.h
+include/at-spi-1.0/libspi/hypertext.h
+include/at-spi-1.0/libspi/image.h
+include/at-spi-1.0/libspi/keymasks.h
+include/at-spi-1.0/libspi/keystrokelistener.h
+include/at-spi-1.0/libspi/libspi.h
+include/at-spi-1.0/libspi/listener.h
+include/at-spi-1.0/libspi/matchrule.h
+include/at-spi-1.0/libspi/relation.h
+include/at-spi-1.0/libspi/remoteobject.h
+include/at-spi-1.0/libspi/selection.h
+include/at-spi-1.0/libspi/stateset.h
+include/at-spi-1.0/libspi/streamablecontent.h
+include/at-spi-1.0/libspi/table.h
+include/at-spi-1.0/libspi/text.h
+include/at-spi-1.0/libspi/value.h
+include/at-spi-1.0/login-helper/Accessibility_LoginHelper.h
+include/at-spi-1.0/login-helper/login-helper.h
+lib/gtk-2.0/modules/libatk-bridge.a
+lib/gtk-2.0/modules/libatk-bridge.la
+lib/gtk-2.0/modules/libatk-bridge.so
+lib/libcspi.a
+lib/libcspi.la
+lib/libcspi.so
+lib/libcspi.so.10
+lib/libloginhelper.a
+lib/libloginhelper.la
+lib/libloginhelper.so
+lib/libloginhelper.so.0
+lib/libspi.a
+lib/libspi.la
+lib/libspi.so
+lib/libspi.so.10
+lib/orbit-2.0/Accessibility_LoginHelper_module.a
+lib/orbit-2.0/Accessibility_LoginHelper_module.la
+lib/orbit-2.0/Accessibility_LoginHelper_module.so
+lib/orbit-2.0/Accessibility_module.a
+lib/orbit-2.0/Accessibility_module.la
+lib/orbit-2.0/Accessibility_module.so
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.py
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/accessible.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.py
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/event.py
+%%PYTHON_SITELIBDIR%%/pyatspi/event.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/event.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.py
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.py
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyo
+libdata/bonobo/servers/Accessibility_Registry.server
+libdata/pkgconfig/cspi-1.0.pc
+libdata/pkgconfig/libloginhelper-1.0.pc
+libdata/pkgconfig/libspi-1.0.pc
+libexec/at-spi-registryd
+share/idl/at-spi-1.0/Accessibility.idl
+share/idl/at-spi-1.0/Accessibility_Accessible.idl
+share/idl/at-spi-1.0/Accessibility_Action.idl
+share/idl/at-spi-1.0/Accessibility_Application.idl
+share/idl/at-spi-1.0/Accessibility_Collection.idl
+share/idl/at-spi-1.0/Accessibility_Component.idl
+share/idl/at-spi-1.0/Accessibility_Desktop.idl
+share/idl/at-spi-1.0/Accessibility_Document.idl
+share/idl/at-spi-1.0/Accessibility_EditableText.idl
+share/idl/at-spi-1.0/Accessibility_Event.idl
+share/idl/at-spi-1.0/Accessibility_Hyperlink.idl
+share/idl/at-spi-1.0/Accessibility_Hypertext.idl
+share/idl/at-spi-1.0/Accessibility_Image.idl
+share/idl/at-spi-1.0/Accessibility_LoginHelper.idl
+share/idl/at-spi-1.0/Accessibility_Registry.idl
+share/idl/at-spi-1.0/Accessibility_Relation.idl
+share/idl/at-spi-1.0/Accessibility_Role.idl
+share/idl/at-spi-1.0/Accessibility_Selection.idl
+share/idl/at-spi-1.0/Accessibility_Selector.idl
+share/idl/at-spi-1.0/Accessibility_State.idl
+share/idl/at-spi-1.0/Accessibility_StreamableContent.idl
+share/idl/at-spi-1.0/Accessibility_Table.idl
+share/idl/at-spi-1.0/Accessibility_Text.idl
+share/idl/at-spi-1.0/Accessibility_Value.idl
+share/locale/ang/LC_MESSAGES/at-spi.mo
+share/locale/ar/LC_MESSAGES/at-spi.mo
+share/locale/as/LC_MESSAGES/at-spi.mo
+share/locale/ast/LC_MESSAGES/at-spi.mo
+share/locale/az/LC_MESSAGES/at-spi.mo
+share/locale/be/LC_MESSAGES/at-spi.mo
+share/locale/be@latin/LC_MESSAGES/at-spi.mo
+share/locale/bg/LC_MESSAGES/at-spi.mo
+share/locale/bn/LC_MESSAGES/at-spi.mo
+share/locale/bn_IN/LC_MESSAGES/at-spi.mo
+share/locale/bs/LC_MESSAGES/at-spi.mo
+share/locale/ca/LC_MESSAGES/at-spi.mo
+share/locale/ca@valencia/LC_MESSAGES/at-spi.mo
+share/locale/crh/LC_MESSAGES/at-spi.mo
+share/locale/cs/LC_MESSAGES/at-spi.mo
+share/locale/cy/LC_MESSAGES/at-spi.mo
+share/locale/da/LC_MESSAGES/at-spi.mo
+share/locale/de/LC_MESSAGES/at-spi.mo
+share/locale/dz/LC_MESSAGES/at-spi.mo
+share/locale/el/LC_MESSAGES/at-spi.mo
+share/locale/en@shaw/LC_MESSAGES/at-spi.mo
+share/locale/en_CA/LC_MESSAGES/at-spi.mo
+share/locale/en_GB/LC_MESSAGES/at-spi.mo
+share/locale/eo/LC_MESSAGES/at-spi.mo
+share/locale/es/LC_MESSAGES/at-spi.mo
+share/locale/et/LC_MESSAGES/at-spi.mo
+share/locale/eu/LC_MESSAGES/at-spi.mo
+share/locale/fa/LC_MESSAGES/at-spi.mo
+share/locale/fi/LC_MESSAGES/at-spi.mo
+share/locale/fr/LC_MESSAGES/at-spi.mo
+share/locale/ga/LC_MESSAGES/at-spi.mo
+share/locale/gl/LC_MESSAGES/at-spi.mo
+share/locale/gu/LC_MESSAGES/at-spi.mo
+share/locale/he/LC_MESSAGES/at-spi.mo
+share/locale/hi/LC_MESSAGES/at-spi.mo
+share/locale/hr/LC_MESSAGES/at-spi.mo
+share/locale/hu/LC_MESSAGES/at-spi.mo
+share/locale/hy/LC_MESSAGES/at-spi.mo
+share/locale/id/LC_MESSAGES/at-spi.mo
+share/locale/is/LC_MESSAGES/at-spi.mo
+share/locale/it/LC_MESSAGES/at-spi.mo
+share/locale/ja/LC_MESSAGES/at-spi.mo
+share/locale/ka/LC_MESSAGES/at-spi.mo
+share/locale/kk/LC_MESSAGES/at-spi.mo
+share/locale/kn/LC_MESSAGES/at-spi.mo
+share/locale/ko/LC_MESSAGES/at-spi.mo
+share/locale/ku/LC_MESSAGES/at-spi.mo
+share/locale/lt/LC_MESSAGES/at-spi.mo
+share/locale/lv/LC_MESSAGES/at-spi.mo
+share/locale/mai/LC_MESSAGES/at-spi.mo
+share/locale/mk/LC_MESSAGES/at-spi.mo
+share/locale/ml/LC_MESSAGES/at-spi.mo
+share/locale/mn/LC_MESSAGES/at-spi.mo
+share/locale/mr/LC_MESSAGES/at-spi.mo
+share/locale/ms/LC_MESSAGES/at-spi.mo
+share/locale/nb/LC_MESSAGES/at-spi.mo
+share/locale/nds/LC_MESSAGES/at-spi.mo
+share/locale/ne/LC_MESSAGES/at-spi.mo
+share/locale/nl/LC_MESSAGES/at-spi.mo
+share/locale/nn/LC_MESSAGES/at-spi.mo
+share/locale/oc/LC_MESSAGES/at-spi.mo
+share/locale/or/LC_MESSAGES/at-spi.mo
+share/locale/pa/LC_MESSAGES/at-spi.mo
+share/locale/pl/LC_MESSAGES/at-spi.mo
+share/locale/ps/LC_MESSAGES/at-spi.mo
+share/locale/pt/LC_MESSAGES/at-spi.mo
+share/locale/pt_BR/LC_MESSAGES/at-spi.mo
+share/locale/ro/LC_MESSAGES/at-spi.mo
+share/locale/ru/LC_MESSAGES/at-spi.mo
+share/locale/rw/LC_MESSAGES/at-spi.mo
+share/locale/sk/LC_MESSAGES/at-spi.mo
+share/locale/sl/LC_MESSAGES/at-spi.mo
+share/locale/sq/LC_MESSAGES/at-spi.mo
+share/locale/sr/LC_MESSAGES/at-spi.mo
+share/locale/sr@ije/LC_MESSAGES/at-spi.mo
+share/locale/sr@latin/LC_MESSAGES/at-spi.mo
+share/locale/sv/LC_MESSAGES/at-spi.mo
+share/locale/ta/LC_MESSAGES/at-spi.mo
+share/locale/te/LC_MESSAGES/at-spi.mo
+share/locale/th/LC_MESSAGES/at-spi.mo
+share/locale/tr/LC_MESSAGES/at-spi.mo
+share/locale/ug/LC_MESSAGES/at-spi.mo
+share/locale/uk/LC_MESSAGES/at-spi.mo
+share/locale/vi/LC_MESSAGES/at-spi.mo
+share/locale/wa/LC_MESSAGES/at-spi.mo
+share/locale/xh/LC_MESSAGES/at-spi.mo
+share/locale/zh_CN/LC_MESSAGES/at-spi.mo
+share/locale/zh_HK/LC_MESSAGES/at-spi.mo
+share/locale/zh_TW/LC_MESSAGES/at-spi.mo
+@dirrm share/idl/at-spi-1.0
+@dirrm %%PYTHON_SITELIBDIR%%/pyatspi
+@dirrm include/at-spi-1.0/login-helper
+@dirrm include/at-spi-1.0/libspi
+@dirrm include/at-spi-1.0/cspi
+@dirrm include/at-spi-1.0
+@dirrmtry lib/orbit-2.0
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/sr@ije/LC_MESSAGES
+@dirrmtry share/locale/sr@ije
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ps/LC_MESSAGES
+@dirrmtry share/locale/ps
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/kk/LC_MESSAGES
+@dirrmtry share/locale/kk
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
+@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/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/ang/LC_MESSAGES
+@dirrmtry share/locale/ang
diff --git a/accessibility/at-spi2-atk/Makefile b/accessibility/at-spi2-atk/Makefile
index e794cc6b5..97f508b10 100644
--- a/accessibility/at-spi2-atk/Makefile
+++ b/accessibility/at-spi2-atk/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.25 2011/04/06 08:35:44 kwm Exp $
+#   $MCom: ports/accessibility/at-spi2-atk/Makefile,v 1.26 2011/04/10 19:41:34 mezz Exp $
 #
 
 PORTNAME=	at-spi2-atk
@@ -20,6 +20,8 @@ BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
 LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
 
+CONFLICTS=	at-spi-1.[0-9]*
+
 LICENSE=        LGPL21
 LICENSE_FILE=   ${WRKSRC}/COPYING
 USE_BZIP2=	yes