From c2d39f04862b52dea46de8f76bec950ef6e8f452 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Wed, 20 Jun 2018 16:59:31 +0000 Subject: Correctly depend on those Python ports. - py-qt have their framework - depending on a single file breaks with multiple flavors. Sponsored by: Absolight --- deskutils/gtg/Makefile | 2 +- devel/hgview/Makefile | 3 +-- devel/py-buildbot-worker/Makefile | 2 +- games/balazar/Makefile | 2 +- net-im/papyon/Makefile | 8 ++++---- net/splatd/Makefile | 4 ++-- sysutils/mog/Makefile | 2 +- www/feedjack/Makefile | 2 +- 8 files changed, 12 insertions(+), 13 deletions(-) diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile index 17202b0fa332..cdadeed3aab1 100644 --- a/deskutils/gtg/Makefile +++ b/deskutils/gtg/Makefile @@ -25,7 +25,7 @@ USE_PYTHON= distutils autoplist OPTIONS_DEFINE= CHEETAH CHEETAH_DESC= Needed for export plugin to work OPTIONS_EXCLUDE= NLS DOCS -CHEETAH_RUN_DEPENDS= ${LOCALBASE}/bin/cheetah:devel/py-cheetah@${FLAVOR} +CHEETAH_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${FLAVOR} .include diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile index b1847dc844f6..d299d7706673 100644 --- a/devel/hgview/Makefile +++ b/devel/hgview/Makefile @@ -17,13 +17,12 @@ RUN_DEPENDS= hg:devel/mercurial \ ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} BUILD_DEPENDS= hg:devel/mercurial \ - pyrcc4:textproc/py-qt4-xml@${FLAVOR} \ xmlto:textproc/xmlto \ asciidoc:textproc/asciidoc NO_ARCH= yes USES= gmake pyqt:4 python:2.7 -USE_PYQT= gui_run qscintilla2_run +USE_PYQT= gui_run qscintilla2_run xml_run USE_PYTHON= distutils PORTDOCS= * diff --git a/devel/py-buildbot-worker/Makefile b/devel/py-buildbot-worker/Makefile index c24c1bd6f2d6..73622ab264e7 100644 --- a/devel/py-buildbot-worker/Makefile +++ b/devel/py-buildbot-worker/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}future>=0.15.2:devel/py-future@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=14.0.1:devel/py-twisted@${FLAVOR} -TEST_DEPENDS= trial:devel/py-twisted@${FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}twisted>0:devel/py-twisted@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} USES= python diff --git a/games/balazar/Makefile b/games/balazar/Makefile index ff734f85b5c3..872366060206 100644 --- a/games/balazar/Makefile +++ b/games/balazar/Makefile @@ -15,7 +15,7 @@ LICENSE= GPLv2+ LIB_DEPENDS= libcal3d.so:graphics/cal3d \ libfreetype.so:print/freetype2 -RUN_DEPENDS= soya_editor:graphics/py-soya3d@${FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}soya3d>0:graphics/py-soya3d@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openal>0:audio/py-openal@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}vorbis>0:audio/py-vorbis@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tofu>0:net/py-tofu@${FLAVOR} \ diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile index d3f28c0ceb8e..39996dea197b 100644 --- a/net-im/papyon/Makefile +++ b/net-im/papyon/Makefile @@ -11,15 +11,15 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= gnome@FreeBSD.org COMMENT= Fork of pymsn to support the telepathy MSN connection manager -BUILD_DEPENDS= py*-openssl>0:security/py-openssl@${FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \ ${PY_ENUM34} \ ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \ - ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gstreamer>0:multimedia/py-gstreamer@${FLAVOR} \ ${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2 -RUN_DEPENDS= py*-openssl>0:security/py-openssl@${FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR} \ ${PY_ENUM34} \ ${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \ - ${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer@${FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}gstreamer>0:multimedia/py-gstreamer@${FLAVOR} \ ${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2 USE_GNOME= pygobject diff --git a/net/splatd/Makefile b/net/splatd/Makefile index 0e5d4ff521c6..a23dc6599253 100644 --- a/net/splatd/Makefile +++ b/net/splatd/Makefile @@ -13,9 +13,9 @@ COMMENT= Splat is the Scalable Periodic LDAP Attribute Transmogrifier LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig@${FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} -RUN_DEPENDS= ${LOCALBASE}/bin/zconfig:devel/py-zconfig@${FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zconfig>0:devel/py-zconfig@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} diff --git a/sysutils/mog/Makefile b/sysutils/mog/Makefile index e17ebe093a36..a98ee6746ffd 100644 --- a/sysutils/mog/Makefile +++ b/sysutils/mog/Makefile @@ -12,7 +12,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${FLAVOR} \ - mdv:devel/py-mdv@${FLAVOR} + ${PYTHON_PKGNAMEPREFIX}mdv>0:devel/py-mdv@${FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USES= python diff --git a/www/feedjack/Makefile b/www/feedjack/Makefile index 04eecd190e09..c65f99e01f3b 100644 --- a/www/feedjack/Makefile +++ b/www/feedjack/Makefile @@ -11,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Feed aggregator written in Python using the Django framework RUN_DEPENDS= ${PYTHON_SITELIBDIR}/feedparser.py:textproc/py-feedparser@${FLAVOR} \ - django-admin.py:www/py-django18@${FLAVOR} + ${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} DIST_SUBDIR= python USES= python:2.7 -- cgit v1.2.3