From owner-svn-ports-all@FreeBSD.ORG  Sat Mar  9 17:10:49 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 9A3B1AFE;
 Sat,  9 Mar 2013 17:10:49 +0000 (UTC) (envelope-from kwm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 5CE35ED;
 Sat,  9 Mar 2013 17:10:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r29HAmO0036265;
 Sat, 9 Mar 2013 17:10:48 GMT (envelope-from kwm@svn.freebsd.org)
Received: (from kwm@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r29HAmZG036263;
 Sat, 9 Mar 2013 17:10:48 GMT (envelope-from kwm@svn.freebsd.org)
Message-Id: <201303091710.r29HAmZG036263@svn.freebsd.org>
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 9 Mar 2013 17:10:48 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313732 - head/accessibility/at-spi
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Mar 2013 17:10:49 -0000

Author: kwm
Date: Sat Mar  9 17:10:48 2013
New Revision: 313732
URL: http://svnweb.freebsd.org/changeset/ports/313732

Log:
  Don't build the libatk-bridge.so gtk module, depend on at-spi2-atk for that.
  This resolves conflict between at-spi2-atk and at-spi.
  
  PR:		ports/176750 [1]
  PR:		ports/176775 [2]
  Sumbitted by:	mandree@ [1], rm@ [2]

Modified:
  head/accessibility/at-spi/Makefile
  head/accessibility/at-spi/pkg-plist

Modified: head/accessibility/at-spi/Makefile
==============================================================================
--- head/accessibility/at-spi/Makefile	Sat Mar  9 16:56:58 2013	(r313731)
+++ head/accessibility/at-spi/Makefile	Sat Mar  9 17:10:48 2013	(r313732)
@@ -4,7 +4,7 @@
 
 PORTNAME=	at-spi
 PORTVERSION=	1.32.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	accessibility x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,6 +16,8 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
+RUN_DEPENDS=	at-spi2-atk>2.6.0:${PORTSDIRS}/accessibility/at-spi2-atk
+
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomehier intlhack gtk20 gconf2 libbonobo
@@ -35,6 +37,7 @@ post-extract:
 post-patch:
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/docs//" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/atk-bridge//" ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
 

Modified: head/accessibility/at-spi/pkg-plist
==============================================================================
--- head/accessibility/at-spi/pkg-plist	Sat Mar  9 16:56:58 2013	(r313731)
+++ head/accessibility/at-spi/pkg-plist	Sat Mar  9 17:10:48 2013	(r313732)
@@ -33,9 +33,6 @@ 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