diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-27 20:53:05 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-06-27 20:53:05 +0800 |
| commit | 3af458ef65af7abadf4b9455565811afee064234 (patch) | |
| tree | 497720033d7fdd92860ec5de28bd50ef1300f1fb | |
| parent | 80918b5ae24a7c349009a5da25419a0dffc0c29c (diff) | |
| download | marcuscom-ports-3af458ef65af7abadf4b9455565811afee064234.tar marcuscom-ports-3af458ef65af7abadf4b9455565811afee064234.tar.gz marcuscom-ports-3af458ef65af7abadf4b9455565811afee064234.tar.bz2 marcuscom-ports-3af458ef65af7abadf4b9455565811afee064234.tar.lz marcuscom-ports-3af458ef65af7abadf4b9455565811afee064234.tar.xz marcuscom-ports-3af458ef65af7abadf4b9455565811afee064234.tar.zst marcuscom-ports-3af458ef65af7abadf4b9455565811afee064234.zip | |
Remove depend on py*-json-py for orca3. It shadows the json implimentions
shipped with python, which orca uses. [1] Add conflicts to both orca ports
to stop it from being installed and causing problems later.
I think this port needs more work but now it runs at least :)
[1] https://bugs.archlinux.org/task/26150
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16969 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | accessibility/orca/Makefile | 8 | ||||
| -rw-r--r-- | accessibility/orca3/Makefile | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/accessibility/orca/Makefile b/accessibility/orca/Makefile index 63f70a01f..5259a8c37 100644 --- a/accessibility/orca/Makefile +++ b/accessibility/orca/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/accessibility/orca/Makefile,v 1.93 2011/04/30 20:43:12 mezz Exp $ +# $MCom: ports/accessibility/orca/Makefile,v 1.94 2011/06/11 18:55:55 mezz Exp $ # PORTNAME= orca @@ -24,7 +24,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/pyatspi/__init__.py:${PORTSDIR}/accessibility/at-spi \ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg -CONFLICTS= orca-3.[0-9]* +CONFLICTS= orca-3.[0-9]* py*-json-py-[0-9]* LATEST_LINK= gnome-orca @@ -36,8 +36,8 @@ USE_GNOME= gnomeprefix gnomehack libgnomeui gnomespeech pygnome2 \ pygnomedesktop INSTALLS_ICONS= yes GNU_CONFIGURE= yes -CPPFLAGS= -I${LOCALBASE}/include -CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= orca.1 diff --git a/accessibility/orca3/Makefile b/accessibility/orca3/Makefile index 2fd397907..996ca3c11 100644 --- a/accessibility/orca3/Makefile +++ b/accessibility/orca3/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom$ +# $MCom: ports/accessibility/orca3/Makefile,v 1.4 2012/06/13 21:09:53 mezz Exp $ # PORTNAME= orca PORTVERSION= 3.4.2 +PORTREVISION= 1 CATEGORIES= accessibility gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -17,15 +18,15 @@ COMMENT= Scriptable screen reader BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \ - ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \ - ${PYTHON_SITELIBDIR}/json.py:${PORTSDIR}/devel/py-json-py + ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo LIB_DEPENDS= atspi.0:${PORTSDIR}/accessibility/at-spi2-core RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_dbus_bindings.so:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/xdg/__init__.py:${PORTSDIR}/devel/py-xdg \ - ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo \ - ${PYTHON_SITELIBDIR}/json.py:${PORTSDIR}/devel/py-json-py + ${PYTHON_SITELIBDIR}/cairo/__init__.py:${PORTSDIR}/graphics/py-cairo -CONFLICTS= orca-2.[0-9]* +# conflict with py*-json-py because orca uses the json from python itself +# and py*-json-py shadows this. +CONFLICTS= orca-2.[0-9]* py*-json-py-[0-9]* LATEST_LINK= gnome-orca3 |