diff options
74 files changed, 102 insertions, 102 deletions
diff --git a/archivers/rox-archive/Makefile b/archivers/rox-archive/Makefile index 70bc8b0e74ff..9d787f3a5dfa 100644 --- a/archivers/rox-archive/Makefile +++ b/archivers/rox-archive/Makefile @@ -11,7 +11,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Archive management tool for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR} USES= python:2.7 shebangfix tar:bzip2 NO_ARCH= yes diff --git a/audio/libgpod/Makefile b/audio/libgpod/Makefile index d02f7e724b0f..0b1568aeaf5a 100644 --- a/audio/libgpod/Makefile +++ b/audio/libgpod/Makefile @@ -39,8 +39,8 @@ MONO_USE= GNOME=gtksharp20 MONO_CONFIGURE_WITH= mono PYTHON_BUILD_DEPENDS= swig3.0:devel/swig30 \ - ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen + ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${PY_FLAVOR} PYTHON_USE= GNOME=pygobject PYTHON_USES= python:2.7 PYTHON_CONFIGURE_ENV= SWIG="${LOCALBASE}/bin/swig3.0" diff --git a/audio/lv2/Makefile b/audio/lv2/Makefile index 93981ef082a1..b7c265bb23e9 100644 --- a/audio/lv2/Makefile +++ b/audio/lv2/Makefile @@ -15,9 +15,9 @@ LICENSE_COMB= multi # Only lv2specgen.py is under MIT LICENSE_FILE_ISCL= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}rdflib>0:textproc/py-rdflib +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}rdflib>0:textproc/py-rdflib@${PY_FLAVOR} CONFLICTS_INSTALL= lv2core @@ -28,7 +28,7 @@ OPTIONS_DEFINE= DOXYGEN EXAMPLES OPTIONS_SUB= yes DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen \ - ${PYTHON_PKGNAMEPREFIX}rdflib>0:textproc/py-rdflib + ${PYTHON_PKGNAMEPREFIX}rdflib>0:textproc/py-rdflib@${PY_FLAVOR} DOXYGEN_CONFIGURE_ON= --docs DOXYGEN_PORTDOCS= * diff --git a/audio/py-opuslib/Makefile b/audio/py-opuslib/Makefile index cd87abe5ef97..7230fec69bd2 100644 --- a/audio/py-opuslib/Makefile +++ b/audio/py-opuslib/Makefile @@ -13,8 +13,8 @@ COMMENT= Python bindings to the libopus, IETF low-delay audio codec LICENSE= BSD3CLAUSE RUN_DEPENDS= ${LOCALBASE}/lib/libopus.so:audio/opus -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.4.1:devel/py-coverage \ - ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=4.4.1:devel/py-coverage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}nose>=1.3.7:devel/py-nose@${PY_FLAVOR} USES= python:-2.7 USE_PYTHON= autoplist distutils diff --git a/cad/fritzing/Makefile b/cad/fritzing/Makefile index ecf122c0b946..5b56437b1781 100644 --- a/cad/fritzing/Makefile +++ b/cad/fritzing/Makefile @@ -26,7 +26,7 @@ MAKE_ENV= INSTALL_ROOT="${STAGEDIR}" BUILD_DEPENDS+= boost-libs>1.52:devel/boost-libs -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} post-extract: cd ${WRKSRC_parts};\ diff --git a/converters/gbsdconv/Makefile b/converters/gbsdconv/Makefile index 633834e6ee6e..97607fcbd52a 100644 --- a/converters/gbsdconv/Makefile +++ b/converters/gbsdconv/Makefile @@ -12,7 +12,7 @@ COMMENT= GUI for bsdconv LICENSE= ISCL LIB_DEPENDS= libtag.so:audio/taglib -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsdconv>=8.0:converters/py-bsdconv +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bsdconv>=8.0:converters/py-bsdconv@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= buganini diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile index 3d962effd44d..f7ed95de9634 100644 --- a/databases/mongodb/Makefile +++ b/databases/mongodb/Makefile @@ -63,7 +63,7 @@ LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 .if ${PORT_OPTIONS:MTEST} USES+= python:build -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.5:databases/pymongo +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=2.5:databases/pymongo@${PY_FLAVOR} TEST_TARGET= smokeAll smokeCppUnittests . if ${PORT_OPTIONS:MSSL} TEST_TARGET+= smokeSsl diff --git a/databases/mongodb32/Makefile b/databases/mongodb32/Makefile index f31d54af40eb..eb7d8d2a29d6 100644 --- a/databases/mongodb32/Makefile +++ b/databases/mongodb32/Makefile @@ -22,8 +22,8 @@ BROKEN_SSL= openssl-devel BROKEN_SSL_REASON_openssl-devel= variable has incomplete type 'EVP_MD_CTX' (aka 'evp_md_ctx_st') LIB_DEPENDS= libpcre.so:devel/pcre \ libsnappy.so:archivers/snappy -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo@${PY_FLAVOR} CHOSEN_COMPILER_TYPE= clang diff --git a/databases/mongodb34-rocks/Makefile b/databases/mongodb34-rocks/Makefile index 3ae250fb028d..d6517b86edb0 100644 --- a/databases/mongodb34-rocks/Makefile +++ b/databases/mongodb34-rocks/Makefile @@ -33,8 +33,8 @@ LIB_DEPENDS= libpcre.so:devel/pcre \ libboost_system.so:devel/boost-libs \ librocksdb.so:databases/rocksdb \ liblz4.so:archivers/liblz4 -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo@${PY_FLAVOR} USES= compiler:c++14-lang cpe python:build scons USE_RC_SUBR= mongod \ diff --git a/databases/mongodb34/Makefile b/databases/mongodb34/Makefile index cd2d7f4d0446..0850f1f43e0d 100644 --- a/databases/mongodb34/Makefile +++ b/databases/mongodb34/Makefile @@ -26,8 +26,8 @@ ONLY_FOR_ARCHS_REASON= "Only supported on amd64 (i386 deprecated in v3)" LIB_DEPENDS= libpcre.so:devel/pcre \ libsnappy.so:archivers/snappy \ libboost_system.so:devel/boost-libs -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \ - ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo@${PY_FLAVOR} CONFLICTS_BUILD= mongo-cxx-driver diff --git a/databases/nagios-check_mongodb/Makefile b/databases/nagios-check_mongodb/Makefile index 178fa5d0ac61..3387df373ca4 100644 --- a/databases/nagios-check_mongodb/Makefile +++ b/databases/nagios-check_mongodb/Makefile @@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}nagios- MAINTAINER= demon@FreeBSD.org COMMENT= Nagios plugin to check mongodb server -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=0:databases/pymongo +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>=0:databases/pymongo@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= mzupan diff --git a/databases/nagios-check_postgres_replication/Makefile b/databases/nagios-check_postgres_replication/Makefile index a39bc5fd9d98..0a2caa2cb160 100644 --- a/databases/nagios-check_postgres_replication/Makefile +++ b/databases/nagios-check_postgres_replication/Makefile @@ -15,8 +15,8 @@ COMMENT= Nagios plugin to check the lag between a postgresql replica and master LICENSE= MIT -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nagiosplugin>=0:sysutils/py-nagiosplugin \ - ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nagiosplugin>=0:sysutils/py-nagiosplugin@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psycopg2>=0:databases/py-psycopg2@${PY_FLAVOR} USES= python shebangfix SHEBANG_FILES= check_postgres_replication.py diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile index 10680ea58713..65d024a683c8 100644 --- a/databases/py-pyPgSQL/Makefile +++ b/databases/py-pyPgSQL/Makefile @@ -13,7 +13,7 @@ COMMENT= Python DB-API 2.0 compliant interface to PostgreSQL LICENSE= BSD2CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mx-base>0:lang/py-mx-base@${PY_FLAVOR} USES= pgsql python:2.7 USE_PYTHON= distutils autoplist diff --git a/databases/xapian-bindings/Makefile b/databases/xapian-bindings/Makefile index 461b9e4069c9..a3a0fce5b604 100644 --- a/databases/xapian-bindings/Makefile +++ b/databases/xapian-bindings/Makefile @@ -21,7 +21,7 @@ LUA_RUN_DEPENDS= ${LUA_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/lua-xapian LUA_USES= lua:run PERL_RUN_DEPENDS= p5-Xapian>=${PORTVERSION}:databases/p5-Xapian PHP_RUN_DEPENDS= php-xapian>=${PORTVERSION}:databases/php-xapian -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/py-xapian +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/py-xapian@${PY_FLAVOR} PYTHON_USES= python:run RUBY_RUN_DEPENDS= ${RUBY_PKGNAMEPREFIX}xapian>=${PORTVERSION}:databases/ruby-xapian RUBY_USE= RUBY=yes diff --git a/deskutils/rox-memo/Makefile b/deskutils/rox-memo/Makefile index e82131ef96d4..e2895078bd3f 100644 --- a/deskutils/rox-memo/Makefile +++ b/deskutils/rox-memo/Makefile @@ -11,7 +11,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Appointment/TODO management for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR} USES= python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= Memo/AppRun Memo/AppletRun diff --git a/devel/bbfreeze/Makefile b/devel/bbfreeze/Makefile index 7278391fc58b..690b29628e6d 100644 --- a/devel/bbfreeze/Makefile +++ b/devel/bbfreeze/Makefile @@ -14,7 +14,7 @@ COMMENT= Module to create standalone executables from Python scripts LICENSE= ZLIB RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:devel/bbfreeze-loader + ${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:devel/bbfreeze-loader@${PY_FLAVOR} USES= python:2.7 zip USE_PYTHON= autoplist distutils diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile index 8157dc1eae63..f70dde3c1166 100644 --- a/devel/gearmand-devel/Makefile +++ b/devel/gearmand-devel/Makefile @@ -12,7 +12,7 @@ MAINTAINER= bdrewery@FreeBSD.org COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:devel/boost-libs \ - ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx + ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid diff --git a/devel/gearmand/Makefile b/devel/gearmand/Makefile index 58b72809fcfe..15bc9cbcf677 100644 --- a/devel/gearmand/Makefile +++ b/devel/gearmand/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ MAINTAINER= bdrewery@FreeBSD.org COMMENT= Gearman C Server and Library -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \ libevent.so:devel/libevent \ libuuid.so:misc/e2fsprogs-libuuid diff --git a/devel/gps/Makefile b/devel/gps/Makefile index 992a1b9687ce..2f7916f7cb79 100644 --- a/devel/gps/Makefile +++ b/devel/gps/Makefile @@ -27,8 +27,8 @@ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ RUN_DEPENDS= rsvg-convert:graphics/librsvg2 \ gdb${PORTGDB}:devel/gdb \ gprbuild:devel/gprbuild \ - ${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \ - ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi + ${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jedi>0:devel/py-jedi@${PY_FLAVOR} GNU_CONFIGURE= yes USES= ada:run gettext gmake perl5 pkgconfig python diff --git a/devel/ice/Makefile b/devel/ice/Makefile index c27d699ecb78..190241ff0e91 100644 --- a/devel/ice/Makefile +++ b/devel/ice/Makefile @@ -33,7 +33,7 @@ USES+= iconv gmake .if ${PORT_OPTIONS:MTEST} && ${SLAVE_PORT} == "no" USES+= python:build -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} .endif USES+= bdb:5 diff --git a/devel/llvm50/Makefile b/devel/llvm50/Makefile index 56b473d98c87..8c51be20a24b 100644 --- a/devel/llvm50/Makefile +++ b/devel/llvm50/Makefile @@ -346,7 +346,7 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .if ${PYTHON_REL} < 3400 LLDB_BUILD_DEPENDS+= \ - ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 + ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${PY_FLAVOR} .endif post-extract-CLANG-on: diff --git a/devel/llvm60/Makefile b/devel/llvm60/Makefile index f65b496f040d..77307a04a763 100644 --- a/devel/llvm60/Makefile +++ b/devel/llvm60/Makefile @@ -351,7 +351,7 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .if ${PYTHON_REL} < 3400 LLDB_BUILD_DEPENDS+= \ - ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34 + ${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34@${PY_FLAVOR} .endif post-extract-CLANG-on: diff --git a/devel/spice-protocol/Makefile b/devel/spice-protocol/Makefile index 0f8903e2a72e..c2a386ae3587 100644 --- a/devel/spice-protocol/Makefile +++ b/devel/spice-protocol/Makefile @@ -11,7 +11,7 @@ COMMENT= Simple Protocol for Independent Computing Environments LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} GNU_CONFIGURE= yes USES= gmake pathfix pkgconfig python tar:bzip2 diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index b896ec3c423a..bc8f318206e8 100644 --- a/devel/subversion/Makefile +++ b/devel/subversion/Makefile @@ -67,7 +67,7 @@ PLIST_SUB+= NO_SVNSERVE_WRAPPER="" .endif .if ${PORT_OPTIONS:MTEST} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .endif .if ${PORT_OPTIONS:MSTATIC} diff --git a/devel/subversion19/Makefile b/devel/subversion19/Makefile index 2a1e07cda04e..7a3f3f02ae73 100644 --- a/devel/subversion19/Makefile +++ b/devel/subversion19/Makefile @@ -69,7 +69,7 @@ PLIST_SUB+= NO_SVNSERVE_WRAPPER="" .endif .if ${PORT_OPTIONS:MTEST} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} .endif .if ${PORT_OPTIONS:MSTATIC} diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile index c4ec370c1596..acef9ffeaa27 100644 --- a/dns/bind9-devel/Makefile +++ b/dns/bind9-devel/Makefile @@ -200,9 +200,9 @@ MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 NATIVE_PKCS11_IMPLIES= THREADS -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_USES= python QUERYTRACE_CONFIGURE_ENABLE= querytrace diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile index 5308b8468697..e6221e3aa80f 100644 --- a/dns/bind911/Makefile +++ b/dns/bind911/Makefile @@ -169,9 +169,9 @@ MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 NATIVE_PKCS11_IMPLIES= THREADS -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_USES= python QUERYTRACE_CONFIGURE_ENABLE= querytrace diff --git a/dns/bind912/Makefile b/dns/bind912/Makefile index 6c69f2c528cf..581a63cd97a9 100644 --- a/dns/bind912/Makefile +++ b/dns/bind912/Makefile @@ -187,9 +187,9 @@ MINCACHE_EXTRA_PATCHES= ${FILESDIR}/extrapatch-bind-min-override-ttl NATIVE_PKCS11_CONFIGURE_ENABLE= native-pkcs11 NATIVE_PKCS11_IMPLIES= THREADS -PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_CONFIGURE_WITH= python=${PYTHON_CMD} -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} PYTHON_USES= python QUERYTRACE_CONFIGURE_ENABLE= querytrace diff --git a/editors/rox-edit/Makefile b/editors/rox-edit/Makefile index b8504dc78dfe..d56c8166e8e0 100644 --- a/editors/rox-edit/Makefile +++ b/editors/rox-edit/Makefile @@ -14,7 +14,7 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/Edit/Help/COPYING RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR} USES= python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= Edit/tests/testreplace.py Edit/AppRun diff --git a/graphics/impressive/Makefile b/graphics/impressive/Makefile index deaaf081fb4a..fca6f3eac1f2 100644 --- a/graphics/impressive/Makefile +++ b/graphics/impressive/Makefile @@ -14,8 +14,8 @@ COMMENT= Stylish way of giving presentations LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/license.txt -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ xpdf:graphics/xpdf \ pdftk:print/pdftk \ xdg-open:devel/xdg-utils \ diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile index 0e281bc226f5..dd17ead022c4 100644 --- a/irc/bitlbee/Makefile +++ b/irc/bitlbee/Makefile @@ -82,7 +82,7 @@ OTR_LIB_DEPENDS= libotr.so.5:security/libotr \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error SKYPE_CONFIGURE_ON= --skype=1 -SKYPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Skype4Py>0:net-im/py-skype4py +SKYPE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Skype4Py>0:net-im/py-skype4py@${PY_FLAVOR} SKYPE_USES= python:2.7 TWITTER_CONFIGURE_OFF= --twitter=0 YAHOO_CONFIGURE_OFF= --yahoo=0 diff --git a/mail/automx/Makefile b/mail/automx/Makefile index a6385dd3516a..7cd92f8a8c84 100644 --- a/mail/automx/Makefile +++ b/mail/automx/Makefile @@ -12,10 +12,10 @@ COMMENT= Handles mail account profile requests from mail clients LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr \ - ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \ - ${PYTHON_PKGNAMEPREFIX}m2crypto>=0:security/py-m2crypto \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}m2crypto>=0:security/py-m2crypto@${PY_FLAVOR} \ wget:ftp/wget \ dig:dns/bind-tools @@ -32,7 +32,7 @@ SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS MEMCACHE MEMCACHE_DESC= Add memcache support -MEMCACHE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached +MEMCACHE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}python-memcached>=0:databases/py-python-memcached@${PY_FLAVOR} do-install: ${MKDIR} ${STAGEDIR}${DATADIR} diff --git a/mail/cleanup-maildir/Makefile b/mail/cleanup-maildir/Makefile index 19f585a7e5d4..d9fe37532849 100644 --- a/mail/cleanup-maildir/Makefile +++ b/mail/cleanup-maildir/Makefile @@ -9,7 +9,7 @@ CATEGORIES= mail python MAINTAINER= ehaupt@FreeBSD.org COMMENT= Script for cleaning up mails in Maildir folders based on arival date -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:graphics/py-graph-core +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}graph-core>=${PORTVERSION}:graphics/py-graph-core@${PY_FLAVOR} USES= python shebangfix USE_GITHUB= yes diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile index c95863e952c8..87fe6d8e8d77 100644 --- a/mail/fetchmail/Makefile +++ b/mail/fetchmail/Makefile @@ -59,7 +59,7 @@ NTLM_PORTDOCS= README.NTLM # POP2 is obsolete POP2_CONFIGURE_ENABLE= POP2 -X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter +X11_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAVOR} X11_CONFIGURE_OFF= PYTHON=: X11_SUB_FILES_OFF= fetchmailconf diff --git a/mail/tumgreyspf/Makefile b/mail/tumgreyspf/Makefile index f29307f25145..4e18fc08ae8a 100644 --- a/mail/tumgreyspf/Makefile +++ b/mail/tumgreyspf/Makefile @@ -15,7 +15,7 @@ COMMENT= External policy checker for the postfix mail server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf@${PY_FLAVOR} OPTIONS_DEFINE= DOCS diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 5e1b5f8efc64..871009f6d92e 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -18,8 +18,8 @@ LIB_DEPENDS= libgc-threaded.so:devel/boehm-gc-threaded \ libsigsegv.so:devel/libsigsegv RUN_DEPENDS= animate:graphics/ImageMagick \ gv:print/gv \ - ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow \ - ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} ALL_TARGET= asy asy-keywords.el diff --git a/misc/cs/Makefile b/misc/cs/Makefile index a5fc9e9ad898..47122328ae5c 100644 --- a/misc/cs/Makefile +++ b/misc/cs/Makefile @@ -12,7 +12,7 @@ COMMENT= Cross Stitch software LICENSE= GPLv2+ -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} NO_BUILD= yes diff --git a/misc/pastebinit/Makefile b/misc/pastebinit/Makefile index be42b46c270f..732b81cee2c8 100644 --- a/misc/pastebinit/Makefile +++ b/misc/pastebinit/Makefile @@ -12,7 +12,7 @@ COMMENT= Command line utility for pastebing LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:devel/py-configobj +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}configobj>=4.3.2:devel/py-configobj@${PY_FLAVOR} USES= python:run shebangfix tar:bzip2 SHEBANG_FILES= pastebinit diff --git a/multimedia/py-PySceneDetect/Makefile b/multimedia/py-PySceneDetect/Makefile index e04c893cce78..2acd4b37c7ec 100644 --- a/multimedia/py-PySceneDetect/Makefile +++ b/multimedia/py-PySceneDetect/Makefile @@ -14,7 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYNUMPY} \ mkvmerge:multimedia/mkvtoolnix \ - ${PYTHON_PKGNAMEPREFIX}opencv>=0:graphics/py-opencv + ${PYTHON_PKGNAMEPREFIX}opencv>=0:graphics/py-opencv@${PY_FLAVOR} USES= python:2.7 USE_GITHUB= yes diff --git a/multimedia/rox-videothumbnail/Makefile b/multimedia/rox-videothumbnail/Makefile index 916b53d9a26b..05b55cf05619 100644 --- a/multimedia/rox-videothumbnail/Makefile +++ b/multimedia/rox-videothumbnail/Makefile @@ -11,7 +11,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Video thumbnail provider for the ROX file manager RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR} WRKSRC= ${WRKDIR}/VideoThumbnail diff --git a/net-mgmt/librenms/Makefile b/net-mgmt/librenms/Makefile index aac727459d8b..d1771efbf2b8 100644 --- a/net-mgmt/librenms/Makefile +++ b/net-mgmt/librenms/Makefile @@ -69,7 +69,7 @@ IPMITOOL_RUN_DEPENDS= ipmitool:sysutils/ipmitool LIBVIRT_RUN_DEPENDS= virsh:devel/libvirt NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap -PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb +PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${PY_FLAVOR} PYPOLLER_VARS= PY_MYSQL=:2.7 X11_RUN_DEPENDS= Magick-config:graphics/ImageMagick \ mtr:net/mtr diff --git a/net-mgmt/observium/Makefile b/net-mgmt/observium/Makefile index 47393e4d2bd0..5970a67cff86 100644 --- a/net-mgmt/observium/Makefile +++ b/net-mgmt/observium/Makefile @@ -55,7 +55,7 @@ IPMITOOL_RUN_DEPENDS= ipmitool:sysutils/ipmitool LIBVIRT_RUN_DEPENDS= virsh:devel/libvirt NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins NMAP_RUN_DEPENDS= nmap:security/nmap -PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb +PYPOLLER_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${PY_FLAVOR} PYPOLLER_VARS= PY_MYSQL=:2.7 SVN_RUN_DEPENDS= svn:devel/subversion WMIC_RUN_DEPENDS= wmic:net-mgmt/wmi-client diff --git a/net-mgmt/pdagent-integrations/Makefile b/net-mgmt/pdagent-integrations/Makefile index 2b0fd8ef3277..100fe3ebe0d4 100644 --- a/net-mgmt/pdagent-integrations/Makefile +++ b/net-mgmt/pdagent-integrations/Makefile @@ -11,7 +11,7 @@ COMMENT= PagerDuty integrations for monitoring monitoring tools LICENSE= BSD3CLAUSE -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdagent>0:net-mgmt/py-pdagent +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pdagent>0:net-mgmt/py-pdagent@${PY_FLAVOR} USES= python:2.7 shebangfix diff --git a/net-p2p/deluge-cli/Makefile b/net-p2p/deluge-cli/Makefile index 1ef525cedfcb..3120fdc843ff 100644 --- a/net-p2p/deluge-cli/Makefile +++ b/net-p2p/deluge-cli/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= intltool-merge:textproc/intltool RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}xdg>=0.18:devel/py-xdg@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/libtorrent-rasterbar-python \ + ${PYTHON_PKGNAMEPREFIX}libtorrent-rasterbar>=0:net-p2p/libtorrent-rasterbar-python@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>=0.8:security/py-openssl@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>=1.0.1:textproc/py-chardet@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mako>=0.2.5:textproc/py-mako@${FLAVOR} \ diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile index 510bbe51e194..19ae3057b737 100644 --- a/net/dpdk/Makefile +++ b/net/dpdk/Makefile @@ -28,7 +28,7 @@ DEBUG_DESC= Debugging support (unoptimized build, impacts performance) TOOLS_DESC= Install tool scripts DEBUG_MAKE_ENV= EXTRA_CFLAGS='-O0 -g' -TOOLS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools +TOOLS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools@${PY_FLAVOR} TOOLS_USES= python:2.7 # build up the list of files in the compiled directory that should be executable diff --git a/net/exabgp/Makefile b/net/exabgp/Makefile index 1f2e2397fd2f..b6857f0f6743 100644 --- a/net/exabgp/Makefile +++ b/net/exabgp/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= GH \ MAINTAINER= zi@FreeBSD.org COMMENT= BGP engine and route injector -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress@${PY_FLAVOR} LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYRIGHT diff --git a/net/google-cloud-sdk/Makefile b/net/google-cloud-sdk/Makefile index 0bcc02463323..678e906c76df 100644 --- a/net/google-cloud-sdk/Makefile +++ b/net/google-cloud-sdk/Makefile @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/google-cloud-sdk PLIST_FILES= bin/bq bin/gcloud bin/git-credential-gcloud.sh bin/gsutil RUN_DEPENDS= python:lang/python \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} post-extract: @${RM} -r \ diff --git a/net/kippo/Makefile b/net/kippo/Makefile index 1f535e08a9c7..1af1e77a444a 100644 --- a/net/kippo/Makefile +++ b/net/kippo/Makefile @@ -12,9 +12,9 @@ COMMENT= Medium interaction ssh honeypot LICENSE= BSD3CLAUSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ - ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} RUN_DEPENDS:= ${BUILD_DEPENDS} USE_GITHUB= yes diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 973bcf2a1a53..06e9b3e18054 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -65,7 +65,7 @@ XMLDUMP_CPPFLAGS= -I${LOCALBASE}/include/libxml2 \ # see http://www.cyberciti.biz/faq/freebsd-jumbo-frames-networking-configration/ JUMBO_FRAMES_CONFIGURE_ON= --enable-jumbo-frames -MAKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako +MAKO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} pre-configure: @(cd ${WRKSRC} && ./autogen.sh --noconfig) diff --git a/net/py-kombu/Makefile b/net/py-kombu/Makefile index 544a20594e07..503d2c00b63f 100644 --- a/net/py-kombu/Makefile +++ b/net/py-kombu/Makefile @@ -26,7 +26,7 @@ ZMQ_DESC= Include ZMQ transport support BEANSTALK_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beanstalkc>0:net/py-beanstalkc@${FLAVOR} BOTO_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>=2.6.0:devel/py-boto@${FLAVOR} -MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo +MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo@${PY_FLAVOR} REDIS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}redis>0:databases/py-redis@${FLAVOR} SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=13.1.0:net/py-pyzmq@${FLAVOR} diff --git a/net/rabbitmq-c-devel/Makefile b/net/rabbitmq-c-devel/Makefile index cf05d7871e87..57215afbc85b 100644 --- a/net/rabbitmq-c-devel/Makefile +++ b/net/rabbitmq-c-devel/Makefile @@ -14,7 +14,7 @@ COMMENT= RabbitMQ C AMQP client library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE-MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} CONFLICTS= rabbitmq-c-[0-9]* diff --git a/net/rabbitmq-c/Makefile b/net/rabbitmq-c/Makefile index d08b57830627..b4aa2a5defd4 100644 --- a/net/rabbitmq-c/Makefile +++ b/net/rabbitmq-c/Makefile @@ -12,7 +12,7 @@ COMMENT= RabbitMQ C AMQP client library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE-MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} CONFLICTS= rabbitmq-c-devel-[0-9]* diff --git a/net/rabbitmq/Makefile b/net/rabbitmq/Makefile index c10f0d1efbc2..594b142e925b 100644 --- a/net/rabbitmq/Makefile +++ b/net/rabbitmq/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE-MPL-RabbitMQ BUILD_DEPENDS= erlang-runtime19>=19.3:lang/erlang-runtime19 \ elixir:lang/elixir \ - ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:devel/py-simplejson@${PY_FLAVOR} \ xmlto:textproc/xmlto \ zip:archivers/zip \ rsync:net/rsync diff --git a/net/scribe/Makefile b/net/scribe/Makefile index 6dc17ba2945e..694284dd96aa 100644 --- a/net/scribe/Makefile +++ b/net/scribe/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libthrift.so:devel/thrift-cpp RUN_DEPENDS= p5-Class-Accessor>0:devel/p5-Class-Accessor \ p5-Thrift>0:devel/p5-Thrift \ - ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift + ${PYTHON_PKGNAMEPREFIX}thrift>0:devel/py-thrift@${PY_FLAVOR} BROKEN_powerpc64= Does not build diff --git a/print/hplip/Makefile b/print/hplip/Makefile index a0df36d856ca..dff67cd7ef0a 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libcupsimage.so:print/cups \ libdbus-1.so:devel/dbus RUN_DEPENDS= cups-filters>=0:print/cups-filters \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus + ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} CONFLICTS_INSTALL= hpijs-[0-9]* @@ -47,12 +47,12 @@ OPTIONS_SUB= yes DOCS_CONFIGURE_ENABLE= doc-build FAX_DESC= PC Send Fax support -FAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab +FAX_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}reportlab>=0:print/py-reportlab@${PY_FLAVOR} FAX_CONFIGURE_ENABLE= fax-build SCAN_DESC= Scanning support SCAN_LIB_DEPENDS= libsane.so:graphics/sane-backends -SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow +SCAN_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} SCAN_CONFIGURE_ENABLE= scan-build SNMP_DESC= Network/JetDirect support diff --git a/science/dlib-cpp/Makefile b/science/dlib-cpp/Makefile index 63cbe25c7f9d..1380fb146db8 100644 --- a/science/dlib-cpp/Makefile +++ b/science/dlib-cpp/Makefile @@ -43,7 +43,7 @@ BLASLAPACK_CMAKE_OFF= -DDLIB_USE_BLAS=0 -DDLIB_USE_LAPACK=0 -DDLIB_USE_MKL_FFT=0 # for PYTHON_PKGNAMEPREFIX PYTHON_USES= python -PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dlib>=0:science/py-dlib +PYTHON_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dlib>=0:science/py-dlib@${PY_FLAVOR} PYTHON_NO_DEPENDS= yes AVX_CMAKE_BOOL= USE_AVX_INSTRUCTIONS diff --git a/security/bro/Makefile b/security/bro/Makefile index d4056483c7a1..6d8ad61b760b 100644 --- a/security/bro/Makefile +++ b/security/bro/Makefile @@ -69,10 +69,10 @@ BROCTL_IMPLIES= BROCCOLI IPSUMDUMP BROCCOLI_LIB_DEPENDS= libbroccoli.so:security/broccoli BROCTL_BUILD_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 \ + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ swig3.0:devel/swig30 BROCTL_RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash \ - ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3 + ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} BROCTL_CMAKE_BOOL= INSTALL_BROCTL BROCTL_USE= LDCONFIG=yes IPSUMDUMP_BUILD_DEPENDS=ipsumdump:net/ipsumdump diff --git a/security/revelation/Makefile b/security/revelation/Makefile index d6da5fe56ed4..7b741fdeb022 100644 --- a/security/revelation/Makefile +++ b/security/revelation/Makefile @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} LIB_DEPENDS= libcrack.so:security/cracklib RUN_DEPENDS:= ${BUILD_DEPENDS} \ - ${PYTHON_PKGNAMEPREFIX}cracklib>0:security/py-cracklib + ${PYTHON_PKGNAMEPREFIX}cracklib>0:security/py-cracklib@${PY_FLAVOR} USES= desktop-file-utils gettext gmake pathfix pkgconfig python:2.7 \ shared-mime-info shebangfix tar:bzip2 diff --git a/security/sandsifter/Makefile b/security/sandsifter/Makefile index 2ace1d711ce9..4b31adb7721a 100644 --- a/security/sandsifter/Makefile +++ b/security/sandsifter/Makefile @@ -14,7 +14,7 @@ ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON=Designed for x86 BUILD_DEPENDS= ${LOCALBASE}/include/capstone/capstone.h:devel/capstone3 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}capstone>0:devel/py-capstone +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}capstone>0:devel/py-capstone@${PY_FLAVOR} USES= gmake python localbase shebangfix diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile index d5588a45357c..e06fc7b1b173 100644 --- a/sysutils/openipmi/Makefile +++ b/sysutils/openipmi/Makefile @@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --with-openssl=no .if ${PORT_OPTIONS:MTKINTER} USES+= python WITH_PYTHON= yes -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter \ +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:x11-toolkits/tix CONFIGURE_ARGS+= --with-tkinter PLIST_SUB+= TKINTER="" diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile index 8050062de887..dc9874e79f39 100644 --- a/sysutils/osquery/Makefile +++ b/sysutils/osquery/Makefile @@ -15,7 +15,7 @@ BUILD_DEPENDS= thrift>=0.11.0:devel/thrift \ bash>0:shells/bash \ linenoise-ng>0:devel/linenoise-ng \ rapidjson>0:devel/rapidjson \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 + ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} LIB_DEPENDS= libaugeas.so:textproc/augeas \ libboost_regex.so:devel/boost-libs \ libgflags.so:devel/gflags \ diff --git a/sysutils/pcbsd-utils-qt5/Makefile b/sysutils/pcbsd-utils-qt5/Makefile index bcd78b964822..2ab23901bdbb 100644 --- a/sysutils/pcbsd-utils-qt5/Makefile +++ b/sysutils/pcbsd-utils-qt5/Makefile @@ -12,14 +12,14 @@ COMMENT= PC-BSD Qt5 Utilities LICENSE= BSD3CLAUSE BUILD_DEPENDS= sphinx-build:textproc/py-sphinx \ - ${PYTHON_PKGNAMEPREFIX}sphinx-intl>=0:textproc/py-sphinx-intl \ - ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-httpdomain>=0:textproc/py-sphinxcontrib-httpdomain \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0:textproc/py-sphinx_rtd_theme \ - ${PYTHON_PKGNAMEPREFIX}alabaster>=0:textproc/py-alabaster \ + ${PYTHON_PKGNAMEPREFIX}sphinx-intl>=0:textproc/py-sphinx-intl@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinxcontrib-httpdomain>=0:textproc/py-sphinxcontrib-httpdomain@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}alabaster>=0:textproc/py-alabaster@${PY_FLAVOR} \ tex-formats>=0:print/tex-formats \ tex-dvipsk>=0:print/tex-dvipsk RUN_DEPENDS= pc-updatemanager:sysutils/pcbsd-utils \ - ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus \ + ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \ cdda2wav:sysutils/cdrtools LIB_DEPENDS= libcurl.so:ftp/curl \ libpoppler-qt5.so:graphics/poppler-qt5 diff --git a/sysutils/py-superlance/Makefile b/sysutils/py-superlance/Makefile index 30ef0ec9c4cd..72236c4004df 100644 --- a/sysutils/py-superlance/Makefile +++ b/sysutils/py-superlance/Makefile @@ -24,7 +24,7 @@ USE_PYTHON= autoplist distutils .include <bsd.port.pre.mk> .if ${PYTHON_REL} < 3300 -TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock +TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} .endif do-test: diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile index d4626373dd7c..bcd09845f6d1 100644 --- a/sysutils/rubygem-smart_proxy_salt/Makefile +++ b/sysutils/rubygem-smart_proxy_salt/Makefile @@ -12,7 +12,7 @@ COMMENT= SaltStack Plug-In for Foreman's Smart Proxy LICENSE= GPLv3 RUN_DEPENDS= foreman-proxy>=1.8.0:net/foreman-proxy \ - ${PYTHON_PKGNAMEPREFIX}salt>0:sysutils/py-salt + ${PYTHON_PKGNAMEPREFIX}salt>0:sysutils/py-salt@${PY_FLAVOR} NO_ARCH= yes diff --git a/sysutils/tuptime/Makefile b/sysutils/tuptime/Makefile index eb288b29df37..43e2141bd4d8 100644 --- a/sysutils/tuptime/Makefile +++ b/sysutils/tuptime/Makefile @@ -10,7 +10,7 @@ COMMENT= Historical and statistical system running time report tool LICENSE= GPLv2 -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3 +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7:databases/py-sqlite3@${PY_FLAVOR} USES= python:run shebangfix USE_GITHUB= yes diff --git a/textproc/py-html2text/Makefile b/textproc/py-html2text/Makefile index bc04da41734a..d2d8fbe8bce9 100644 --- a/textproc/py-html2text/Makefile +++ b/textproc/py-html2text/Makefile @@ -13,7 +13,7 @@ COMMENT= Convert HTML into clean plain ASCII text LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>=0:devel/py-coverage@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist diff --git a/textproc/py-wtforms/Makefile b/textproc/py-wtforms/Makefile index 33939ab170eb..e418cd6aa691 100644 --- a/textproc/py-wtforms/Makefile +++ b/textproc/py-wtforms/Makefile @@ -18,7 +18,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Babel>0:devel/py-babel@${FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8 \ + ${PYTHON_PKGNAMEPREFIX}pep8>0:devel/pep8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} OPTIONS_DEFINE= DOCS diff --git a/textproc/rubygem-albino/Makefile b/textproc/rubygem-albino/Makefile index 866a507d1196..162f51625bd3 100644 --- a/textproc/rubygem-albino/Makefile +++ b/textproc/rubygem-albino/Makefile @@ -13,7 +13,7 @@ COMMENT= Ruby wrapper for pygmentize LICENSE= MIT RUN_DEPENDS= rubygem-posix-spawn>=0.3.6:devel/rubygem-posix-spawn \ - ${PYTHON_PKGNAMEPREFIX}pygments>=0.8:textproc/py-pygments + ${PYTHON_PKGNAMEPREFIX}pygments>=0.8:textproc/py-pygments@${PY_FLAVOR} NO_ARCH= yes diff --git a/www/planet/Makefile b/www/planet/Makefile index 22d911036935..ff12139768c4 100644 --- a/www/planet/Makefile +++ b/www/planet/Makefile @@ -10,7 +10,7 @@ MAINTAINER= alan@wave2.co.uk COMMENT= Planet is a flexible feed aggregator - and more! RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/Tidy/Tidy.py:devel/py-mx-experimental \ - ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb + ${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${PY_FLAVOR} USES= python:2.7 tar:bzip2 NO_BUILD= yes diff --git a/www/py-bottle-cork/Makefile b/www/py-bottle-cork/Makefile index 544c58c45635..d635d1b0b347 100644 --- a/www/py-bottle-cork/Makefile +++ b/www/py-bottle-cork/Makefile @@ -27,7 +27,7 @@ OPTIONS_DEFINE= SQLITE MONGODB SQLALCHEMY EXAMPLES .include <bsd.port.options.mk> SQLITE_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} -MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo +MONGODB_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pymongo>0:databases/pymongo@${PY_FLAVOR} SQLALCHEMY_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${FLAVOR} .if ${PORT_OPTIONS:MEXAMPLES} diff --git a/www/py-django-mezzanine/Makefile b/www/py-django-mezzanine/Makefile index 767bc1cdb253..93dd5fc82783 100644 --- a/www/py-django-mezzanine/Makefile +++ b/www/py-django-mezzanine/Makefile @@ -26,7 +26,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/py-django18@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}future>=0.9.0:devel/py-future@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8 \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pep8>=1.4.1:devel/pep8@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyflakes>=0.6.1:devel/py-pyflakes@${FLAVOR} USES= gettext python diff --git a/x11-fm/rox-mime-editor/Makefile b/x11-fm/rox-mime-editor/Makefile index 3bfbc755082a..9d99bde9195a 100644 --- a/x11-fm/rox-mime-editor/Makefile +++ b/x11-fm/rox-mime-editor/Makefile @@ -11,7 +11,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= MIME type editor for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR} USES= python:2.7 shebangfix tar:bzip2 SHEBANG_FILES= MIME-Editor/AppRun diff --git a/x11-fm/rox-session/Makefile b/x11-fm/rox-session/Makefile index 6b46afa068f1..2cad23987bf8 100644 --- a/x11-fm/rox-session/Makefile +++ b/x11-fm/rox-session/Makefile @@ -13,7 +13,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib \ + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} WRKSRC= ${WRKDIR}/ROX-Session diff --git a/x11/rox-wallpaper/Makefile b/x11/rox-wallpaper/Makefile index b91091223c74..4d18ce223152 100644 --- a/x11/rox-wallpaper/Makefile +++ b/x11/rox-wallpaper/Makefile @@ -11,7 +11,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= Wallpaper management tool for the ROX desktop RUN_DEPENDS= ${LOCALBASE}/bin/rox:x11-fm/rox-filer \ - ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib + ${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib@${PY_FLAVOR} USES= python:2.7 shebangfix SHEBANG_FILES= AppRun |