Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 May 2018 13:15:13 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r470610 - in head: archivers/rox-archive audio/libgpod audio/lv2 audio/py-opuslib cad/fritzing converters/gbsdconv databases/mongodb databases/mongodb32 databases/mongodb34 databases/mo...
Message-ID:  <201805221315.w4MDFDm0000145@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Tue May 22 13:15:13 2018
New Revision: 470610
URL: https://svnweb.freebsd.org/changeset/ports/470610

Log:
  Add PY_FLAVOR to Python module dependencies.
  
  Sponsored by:	Absolight

Modified:
  head/archivers/rox-archive/Makefile   (contents, props changed)
  head/audio/libgpod/Makefile   (contents, props changed)
  head/audio/lv2/Makefile   (contents, props changed)
  head/audio/py-opuslib/Makefile   (contents, props changed)
  head/cad/fritzing/Makefile   (contents, props changed)
  head/converters/gbsdconv/Makefile   (contents, props changed)
  head/databases/mongodb/Makefile   (contents, props changed)
  head/databases/mongodb32/Makefile   (contents, props changed)
  head/databases/mongodb34-rocks/Makefile   (contents, props changed)
  head/databases/mongodb34/Makefile   (contents, props changed)
  head/databases/nagios-check_mongodb/Makefile   (contents, props changed)
  head/databases/nagios-check_postgres_replication/Makefile   (contents, props changed)
  head/databases/py-pyPgSQL/Makefile   (contents, props changed)
  head/databases/xapian-bindings/Makefile   (contents, props changed)
  head/deskutils/rox-memo/Makefile   (contents, props changed)
  head/devel/bbfreeze/Makefile   (contents, props changed)
  head/devel/gearmand-devel/Makefile   (contents, props changed)
  head/devel/gearmand/Makefile   (contents, props changed)
  head/devel/gps/Makefile   (contents, props changed)
  head/devel/ice/Makefile   (contents, props changed)
  head/devel/llvm50/Makefile   (contents, props changed)
  head/devel/llvm60/Makefile   (contents, props changed)
  head/devel/spice-protocol/Makefile   (contents, props changed)
  head/devel/subversion/Makefile   (contents, props changed)
  head/devel/subversion19/Makefile   (contents, props changed)
  head/dns/bind9-devel/Makefile   (contents, props changed)
  head/dns/bind911/Makefile   (contents, props changed)
  head/dns/bind912/Makefile   (contents, props changed)
  head/editors/rox-edit/Makefile   (contents, props changed)
  head/graphics/impressive/Makefile   (contents, props changed)
  head/irc/bitlbee/Makefile   (contents, props changed)
  head/mail/automx/Makefile   (contents, props changed)
  head/mail/cleanup-maildir/Makefile   (contents, props changed)
  head/mail/fetchmail/Makefile   (contents, props changed)
  head/mail/tumgreyspf/Makefile   (contents, props changed)
  head/math/asymptote/Makefile   (contents, props changed)
  head/misc/cs/Makefile   (contents, props changed)
  head/misc/pastebinit/Makefile   (contents, props changed)
  head/multimedia/py-PySceneDetect/Makefile   (contents, props changed)
  head/multimedia/rox-videothumbnail/Makefile   (contents, props changed)
  head/net-mgmt/librenms/Makefile   (contents, props changed)
  head/net-mgmt/observium/Makefile   (contents, props changed)
  head/net-mgmt/pdagent-integrations/Makefile   (contents, props changed)
  head/net-p2p/deluge-cli/Makefile   (contents, props changed)
  head/net/dpdk/Makefile   (contents, props changed)
  head/net/exabgp/Makefile   (contents, props changed)
  head/net/google-cloud-sdk/Makefile   (contents, props changed)
  head/net/kippo/Makefile   (contents, props changed)
  head/net/ntop/Makefile   (contents, props changed)
  head/net/py-kombu/Makefile   (contents, props changed)
  head/net/rabbitmq-c-devel/Makefile   (contents, props changed)
  head/net/rabbitmq-c/Makefile   (contents, props changed)
  head/net/rabbitmq/Makefile   (contents, props changed)
  head/net/scribe/Makefile   (contents, props changed)
  head/print/hplip/Makefile   (contents, props changed)
  head/science/dlib-cpp/Makefile   (contents, props changed)
  head/security/bro/Makefile   (contents, props changed)
  head/security/revelation/Makefile   (contents, props changed)
  head/security/sandsifter/Makefile   (contents, props changed)
  head/sysutils/openipmi/Makefile   (contents, props changed)
  head/sysutils/osquery/Makefile   (contents, props changed)
  head/sysutils/pcbsd-utils-qt5/Makefile   (contents, props changed)
  head/sysutils/py-superlance/Makefile   (contents, props changed)
  head/sysutils/rubygem-smart_proxy_salt/Makefile   (contents, props changed)
  head/sysutils/tuptime/Makefile   (contents, props changed)
  head/textproc/py-html2text/Makefile   (contents, props changed)
  head/textproc/py-wtforms/Makefile   (contents, props changed)
  head/textproc/rubygem-albino/Makefile   (contents, props changed)
  head/www/planet/Makefile   (contents, props changed)
  head/www/py-bottle-cork/Makefile   (contents, props changed)
  head/www/py-django-mezzanine/Makefile   (contents, props changed)
  head/x11-fm/rox-mime-editor/Makefile   (contents, props changed)
  head/x11-fm/rox-session/Makefile   (contents, props changed)
  head/x11/rox-wallpaper/Makefile   (contents, props changed)

Modified: head/archivers/rox-archive/Makefile
==============================================================================
--- head/archivers/rox-archive/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/archivers/rox-archive/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/audio/libgpod/Makefile
==============================================================================
--- head/audio/libgpod/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/audio/libgpod/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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"

Modified: head/audio/lv2/Makefile
==============================================================================
--- head/audio/lv2/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/audio/lv2/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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=	*
 

Modified: head/audio/py-opuslib/Makefile
==============================================================================
--- head/audio/py-opuslib/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/audio/py-opuslib/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -13,8 +13,8 @@ COMMENT=	Python bindings to the libopus, IETF low-dela
 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

Modified: head/cad/fritzing/Makefile
==============================================================================
--- head/cad/fritzing/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/cad/fritzing/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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};\

Modified: head/converters/gbsdconv/Makefile
==============================================================================
--- head/converters/gbsdconv/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/converters/gbsdconv/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/databases/mongodb/Makefile
==============================================================================
--- head/databases/mongodb/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/databases/mongodb/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/databases/mongodb32/Makefile
==============================================================================
--- head/databases/mongodb32/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/databases/mongodb32/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/databases/mongodb34-rocks/Makefile
==============================================================================
--- head/databases/mongodb34-rocks/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/databases/mongodb34-rocks/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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 \

Modified: head/databases/mongodb34/Makefile
==============================================================================
--- head/databases/mongodb34/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/databases/mongodb34/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -26,8 +26,8 @@ ONLY_FOR_ARCHS_REASON=	"Only supported on amd64 (i386 
 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
 

Modified: head/databases/nagios-check_mongodb/Makefile
==============================================================================
--- head/databases/nagios-check_mongodb/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/databases/nagios-check_mongodb/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/databases/nagios-check_postgres_replication/Makefile
==============================================================================
--- head/databases/nagios-check_postgres_replication/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/databases/nagios-check_postgres_replication/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -15,8 +15,8 @@ COMMENT=	Nagios plugin to check the lag between a post
 
 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

Modified: head/databases/py-pyPgSQL/Makefile
==============================================================================
--- head/databases/py-pyPgSQL/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/databases/py-pyPgSQL/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -13,7 +13,7 @@ COMMENT=	Python DB-API 2.0 compliant interface to Post
 
 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

Modified: head/databases/xapian-bindings/Makefile
==============================================================================
--- head/databases/xapian-bindings/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/databases/xapian-bindings/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -21,7 +21,7 @@ LUA_RUN_DEPENDS=	${LUA_PKGNAMEPREFIX}xapian>=${PORTVER
 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

Modified: head/deskutils/rox-memo/Makefile
==============================================================================
--- head/deskutils/rox-memo/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/deskutils/rox-memo/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/devel/bbfreeze/Makefile
==============================================================================
--- head/devel/bbfreeze/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/bbfreeze/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -14,7 +14,7 @@ COMMENT=	Module to create standalone executables from 
 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

Modified: head/devel/gearmand-devel/Makefile
==============================================================================
--- head/devel/gearmand-devel/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/gearmand-devel/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/devel/gearmand/Makefile
==============================================================================
--- head/devel/gearmand/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/gearmand/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -10,7 +10,7 @@ MASTER_SITES=	http://launchpad.net/gearmand/1.0/${PORT
 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

Modified: head/devel/gps/Makefile
==============================================================================
--- head/devel/gps/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/gps/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/devel/ice/Makefile
==============================================================================
--- head/devel/ice/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/ice/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/devel/llvm50/Makefile
==============================================================================
--- head/devel/llvm50/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/llvm50/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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:

Modified: head/devel/llvm60/Makefile
==============================================================================
--- head/devel/llvm60/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/llvm60/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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:

Modified: head/devel/spice-protocol/Makefile
==============================================================================
--- head/devel/spice-protocol/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/spice-protocol/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -11,7 +11,7 @@ COMMENT=	Simple Protocol for Independent Computing Env
 
 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

Modified: head/devel/subversion/Makefile
==============================================================================
--- head/devel/subversion/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/subversion/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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}

Modified: head/devel/subversion19/Makefile
==============================================================================
--- head/devel/subversion19/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/devel/subversion19/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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}

Modified: head/dns/bind9-devel/Makefile
==============================================================================
--- head/dns/bind9-devel/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/dns/bind9-devel/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -200,9 +200,9 @@ MINCACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-mi
 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

Modified: head/dns/bind911/Makefile
==============================================================================
--- head/dns/bind911/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/dns/bind911/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -169,9 +169,9 @@ MINCACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-mi
 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

Modified: head/dns/bind912/Makefile
==============================================================================
--- head/dns/bind912/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/dns/bind912/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -187,9 +187,9 @@ MINCACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-mi
 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

Modified: head/editors/rox-edit/Makefile
==============================================================================
--- head/editors/rox-edit/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/editors/rox-edit/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/graphics/impressive/Makefile
==============================================================================
--- head/graphics/impressive/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/graphics/impressive/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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 \

Modified: head/irc/bitlbee/Makefile
==============================================================================
--- head/irc/bitlbee/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/irc/bitlbee/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/mail/automx/Makefile
==============================================================================
--- head/mail/automx/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/mail/automx/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -12,10 +12,10 @@ COMMENT=	Handles mail account profile requests from ma
 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}

Modified: head/mail/cleanup-maildir/Makefile
==============================================================================
--- head/mail/cleanup-maildir/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/mail/cleanup-maildir/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/mail/fetchmail/Makefile
==============================================================================
--- head/mail/fetchmail/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/mail/fetchmail/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/mail/tumgreyspf/Makefile
==============================================================================
--- head/mail/tumgreyspf/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/mail/tumgreyspf/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -15,7 +15,7 @@ COMMENT=	External policy checker for the postfix mail 
 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
 

Modified: head/math/asymptote/Makefile
==============================================================================
--- head/math/asymptote/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/math/asymptote/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/misc/cs/Makefile
==============================================================================
--- head/misc/cs/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/misc/cs/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/misc/pastebinit/Makefile
==============================================================================
--- head/misc/pastebinit/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/misc/pastebinit/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/multimedia/py-PySceneDetect/Makefile
==============================================================================
--- head/multimedia/py-PySceneDetect/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/multimedia/py-PySceneDetect/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/multimedia/rox-videothumbnail/Makefile
==============================================================================
--- head/multimedia/rox-videothumbnail/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/multimedia/rox-videothumbnail/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/net-mgmt/librenms/Makefile
==============================================================================
--- head/net-mgmt/librenms/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net-mgmt/librenms/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/net-mgmt/observium/Makefile
==============================================================================
--- head/net-mgmt/observium/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net-mgmt/observium/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/net-mgmt/pdagent-integrations/Makefile
==============================================================================
--- head/net-mgmt/pdagent-integrations/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net-mgmt/pdagent-integrations/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -11,7 +11,7 @@ COMMENT=	PagerDuty integrations for monitoring monitor
 
 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
 

Modified: head/net-p2p/deluge-cli/Makefile
==============================================================================
--- head/net-p2p/deluge-cli/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net-p2p/deluge-cli/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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} \

Modified: head/net/dpdk/Makefile
==============================================================================
--- head/net/dpdk/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/dpdk/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -28,7 +28,7 @@ DEBUG_DESC=	Debugging support (unoptimized build, impa
 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

Modified: head/net/exabgp/Makefile
==============================================================================
--- head/net/exabgp/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/exabgp/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/net/google-cloud-sdk/Makefile
==============================================================================
--- head/net/google-cloud-sdk/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/google-cloud-sdk/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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 \

Modified: head/net/kippo/Makefile
==============================================================================
--- head/net/kippo/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/kippo/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/net/ntop/Makefile
==============================================================================
--- head/net/ntop/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/ntop/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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)

Modified: head/net/py-kombu/Makefile
==============================================================================
--- head/net/py-kombu/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/py-kombu/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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}

Modified: head/net/rabbitmq-c-devel/Makefile
==============================================================================
--- head/net/rabbitmq-c-devel/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/rabbitmq-c-devel/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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]*
 

Modified: head/net/rabbitmq-c/Makefile
==============================================================================
--- head/net/rabbitmq-c/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/rabbitmq-c/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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]*
 

Modified: head/net/rabbitmq/Makefile
==============================================================================
--- head/net/rabbitmq/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/rabbitmq/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/net/scribe/Makefile
==============================================================================
--- head/net/scribe/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/net/scribe/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/print/hplip/Makefile
==============================================================================
--- head/print/hplip/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/print/hplip/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/science/dlib-cpp/Makefile
==============================================================================
--- head/science/dlib-cpp/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/science/dlib-cpp/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -43,7 +43,7 @@ BLASLAPACK_CMAKE_OFF=	-DDLIB_USE_BLAS=0 -DDLIB_USE_LAP
 
 # 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

Modified: head/security/bro/Makefile
==============================================================================
--- head/security/bro/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/security/bro/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/security/revelation/Makefile
==============================================================================
--- head/security/revelation/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/security/revelation/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-
 		${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

Modified: head/security/sandsifter/Makefile
==============================================================================
--- head/security/sandsifter/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/security/sandsifter/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/sysutils/openipmi/Makefile
==============================================================================
--- head/sysutils/openipmi/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/sysutils/openipmi/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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=""

Modified: head/sysutils/osquery/Makefile
==============================================================================
--- head/sysutils/osquery/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/sysutils/osquery/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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 \

Modified: head/sysutils/pcbsd-utils-qt5/Makefile
==============================================================================
--- head/sysutils/pcbsd-utils-qt5/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/sysutils/pcbsd-utils-qt5/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/sysutils/py-superlance/Makefile
==============================================================================
--- head/sysutils/py-superlance/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/sysutils/py-superlance/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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:

Modified: head/sysutils/rubygem-smart_proxy_salt/Makefile
==============================================================================
--- head/sysutils/rubygem-smart_proxy_salt/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/sysutils/rubygem-smart_proxy_salt/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/sysutils/tuptime/Makefile
==============================================================================
--- head/sysutils/tuptime/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/sysutils/tuptime/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -10,7 +10,7 @@ COMMENT=	Historical and statistical system running tim
 
 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

Modified: head/textproc/py-html2text/Makefile
==============================================================================
--- head/textproc/py-html2text/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/textproc/py-html2text/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/textproc/py-wtforms/Makefile
==============================================================================
--- head/textproc/py-wtforms/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/textproc/py-wtforms/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/textproc/rubygem-albino/Makefile
==============================================================================
--- head/textproc/rubygem-albino/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/textproc/rubygem-albino/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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
 

Modified: head/www/planet/Makefile
==============================================================================
--- head/www/planet/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/www/planet/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/www/py-bottle-cork/Makefile
==============================================================================
--- head/www/py-bottle-cork/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/www/py-bottle-cork/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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}

Modified: head/www/py-django-mezzanine/Makefile
==============================================================================
--- head/www/py-django-mezzanine/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/www/py-django-mezzanine/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -26,7 +26,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=1.8:www/
 		${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

Modified: head/x11-fm/rox-mime-editor/Makefile
==============================================================================
--- head/x11-fm/rox-mime-editor/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/x11-fm/rox-mime-editor/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/x11-fm/rox-session/Makefile
==============================================================================
--- head/x11-fm/rox-session/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/x11-fm/rox-session/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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

Modified: head/x11/rox-wallpaper/Makefile
==============================================================================
--- head/x11/rox-wallpaper/Makefile	Tue May 22 13:14:43 2018	(r470609)
+++ head/x11/rox-wallpaper/Makefile	Tue May 22 13:15:13 2018	(r470610)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805221315.w4MDFDm0000145>