diff options
author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-11 10:42:14 +0800 |
---|---|---|
committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2011-04-11 10:42:14 +0800 |
commit | 215822dd7c2b3b237eaa16ac787acb47cfa6fc1e (patch) | |
tree | b2b2664092931936ead9ee2577355f4c07cb9242 | |
parent | dc0e64f5c686b86b4ac03bcadb90334c84712577 (diff) | |
download | marcuscom-ports-215822dd7c2b3b237eaa16ac787acb47cfa6fc1e.tar marcuscom-ports-215822dd7c2b3b237eaa16ac787acb47cfa6fc1e.tar.gz marcuscom-ports-215822dd7c2b3b237eaa16ac787acb47cfa6fc1e.tar.bz2 marcuscom-ports-215822dd7c2b3b237eaa16ac787acb47cfa6fc1e.tar.lz marcuscom-ports-215822dd7c2b3b237eaa16ac787acb47cfa6fc1e.tar.xz marcuscom-ports-215822dd7c2b3b237eaa16ac787acb47cfa6fc1e.tar.zst marcuscom-ports-215822dd7c2b3b237eaa16ac787acb47cfa6fc1e.zip |
Add CONFLICTS with the each others.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@15796 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r-- | accessibility/at-spi/Makefile | 4 | ||||
-rw-r--r-- | accessibility/py-atspi/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile index 1f5fd5fd9..d8b4d0ad5 100644 --- a/accessibility/at-spi/Makefile +++ b/accessibility/at-spi/Makefile @@ -3,7 +3,7 @@ # 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 $ +# $MCom: ports/accessibility/at-spi/Makefile,v 1.105 2011/04/10 20:06:06 mezz Exp $ # PORTNAME= at-spi @@ -20,7 +20,7 @@ USE_BZIP2= yes .if !defined(REFERENCE_PORT) -CONFLICTS= at-spi2-atk-2.[0-9]* +CONFLICTS= at-spi2-atk-2.[0-9]* py[0-9][0-9]-atspi-2.[0-9]* USE_GETTEXT= yes USE_GMAKE= yes diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile index 001811b36..ddfab2903 100644 --- a/accessibility/py-atspi/Makefile +++ b/accessibility/py-atspi/Makefile @@ -3,7 +3,7 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/py-atspi/Makefile,v 1.19 2011/03/23 11:38:32 kwm Exp $ +# $MCom: ports/accessibility/py-atspi/Makefile,v 1.20 2011/04/05 19:45:26 kwm Exp $ # PORTNAME= atspi @@ -21,6 +21,8 @@ COMMENT= Python API for the D-BUS based SPI framework LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= ${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core +CONFLICTS= at-spi-1.[0-9]* + USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes |