Use PY_FLAVOR for dependencies.

FLAVOR is the current port's flavor, it should not be used outside of
this scope.

Sponsored by:	Absolight

16 files changed, 87 insertions, 87 deletions

diff --git a/deskutils/dosage/Makefile b/deskutils/dosage/Makefile
index f75e39c1130f..6e317a0199e1 100644
--- a/deskutils/dosage/Makefile
+++ b/deskutils/dosage/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Application to keep a local mirror of web comics
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist concurrent optsuffix
diff --git a/deskutils/gourmet/Makefile b/deskutils/gourmet/Makefile
index 4212af72e4b7..1f7375bc6183 100644
--- a/deskutils/gourmet/Makefile
+++ b/deskutils/gourmet/Makefile
@@ -12,20 +12,20 @@ COMMENT=	GNOME recipe manager
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=0:databases/py-sqlalchemy10@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}poppler>=0:graphics/py-poppler@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}rtf>=0:print/py-rtf@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}elib.intl>0:textproc/py-elib.intl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup32>0:www/py-beautifulsoup32@${PY_FLAVOR}
 
 OPTIONS_DEFINE=		IPYTHON
 IPYTHON_DESC=		Interactive shell support
-IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${FLAVOR}
+IPYTHON_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipython>0:devel/ipython@${PY_FLAVOR}
 
 USES=		gettext python:-2.7
 USE_GNOME=	intltool pygnome2 pygtk2
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index cdadeed3aab1..a116aa7bf7ac 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -11,9 +11,9 @@ COMMENT=	GTD organizer for the GNOME desktop environment
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch@${FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}liblarch>=2.1:devel/py-liblarch@${PY_FLAVOR} \
 		xset:x11/xset
 
 USE_GNOME=	pygobject pygtk2
@@ -25,7 +25,7 @@ USE_PYTHON=	distutils autoplist
 OPTIONS_DEFINE=		CHEETAH
 CHEETAH_DESC=		Needed for export plugin to work
 OPTIONS_EXCLUDE=	NLS DOCS
-CHEETAH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${FLAVOR}
+CHEETAH_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cheetah>0:devel/py-cheetah@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
diff --git a/deskutils/py-bugwarrior/Makefile b/deskutils/py-bugwarrior/Makefile
index 3d57958a3c4f..814aac6cf9c6 100644
--- a/deskutils/py-bugwarrior/Makefile
+++ b/deskutils/py-bugwarrior/Makefile
@@ -14,38 +14,38 @@ COMMENT=	Sync issue & bug tracking systems with taskwarrior
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twiggy>0:devel/py-twiggy@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}taskw>=0.8:deskutils/py-taskw@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.2:devel/py-Jinja2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycurl>0:ftp/py-pycurl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dogpile.cache>=0.5.3:devel/py-dogpile.cache@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.9.1:devel/py-lockfile@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>0:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR}
 
 OPTIONS_DEFINE=		BUGZILLA JIRA PHABRICATOR
 OPTIONS_DEFAULT=	BUGZILLA JIRA PHABRICATOR
 
 BUGZILLA_DESC=			Enable Bugzilla support
-BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla@${FLAVOR}
+BUGZILLA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}python-bugzilla>0:devel/py-python-bugzilla@${PY_FLAVOR}
 
 JIRA_DESC=			Enabla Atlassian Jira support
-JIRA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira@${FLAVOR}
+JIRA_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}jira>0:devel/py-jira@${PY_FLAVOR}
 
 PHABRICATOR_DESC=		Enable Phabricator support
-PHABRICATOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator@${FLAVOR}
+PHABRICATOR_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}phabricator>0:devel/py-phabricator@${PY_FLAVOR}
 
 TRAC_DESC=			Enable Trac support
-TRAC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac@${FLAVOR}
+TRAC_RUN_DEPENDS=		${PYTHON_PKGNAMEPREFIX}offtrac>0:devel/py-offtrac@${PY_FLAVOR}
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist concurrent distutils
diff --git a/deskutils/py-khal/Makefile b/deskutils/py-khal/Makefile
index 517c421b6b3c..b9f33dfacd09 100644
--- a/deskutils/py-khal/Makefile
+++ b/deskutils/py-khal/Makefile
@@ -13,19 +13,19 @@ COMMENT=	CalDAV-based calendar
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click-log>=0.2.0:devel/py-click-log@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}icalendar>=3.11.7:devel/py-icalendar@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>1.12.0:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=3.2:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-log>=0.2.0:devel/py-click-log@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}configobj>=0:devel/py-configobj@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}icalendar>=3.11.7:devel/py-icalendar@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>=0:devel/py-pytz@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tzlocal>=1.0:devel/py-tzlocal@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urwid>=0:devel/py-urwid@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}vdirsyncer>=0:deskutils/py-vdirsyncer@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
@@ -35,7 +35,7 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=	SETPROCTITLE
 
 SETPROCTITLE_DESC=	Set the process title
-SETPROCTITLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setproctitle>=0:devel/py-setproctitle@${FLAVOR}
+SETPROCTITLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setproctitle>=0:devel/py-setproctitle@${PY_FLAVOR}
 
 PLIST_FILES=	share/zsh/site-functions/__khal
 
diff --git a/deskutils/py-pystash/Makefile b/deskutils/py-pystash/Makefile
index 2d3d10937f70..5702d4a6cfee 100644
--- a/deskutils/py-pystash/Makefile
+++ b/deskutils/py-pystash/Makefile
@@ -11,10 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Save your code snippets in the cloud from the command line
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}args>=0.1.0:devel/py-args@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}clint>=0.3.7:devel/py-clint@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.3.0:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xerox>=0.3.1:devel/py-xerox@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/py-taskw/Makefile b/deskutils/py-taskw/Makefile
index 1e83d446b56d..c11023aa2ec3 100644
--- a/deskutils/py-taskw/Makefile
+++ b/deskutils/py-taskw/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Python bindings for your taskwarrior database
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=1.3.4:devel/py-nose@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist distutils
diff --git a/deskutils/py-vdirsyncer/Makefile b/deskutils/py-vdirsyncer/Makefile
index 4edeec69857d..13d7b36416e6 100644
--- a/deskutils/py-vdirsyncer/Makefile
+++ b/deskutils/py-vdirsyncer/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Synchronize calendars and contacts
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm@${FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click-log>=0.1.3:devel/py-click-log@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}click-threading>=0.1.2:devel/py-click-threading@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt@${FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=1.10.1:devel/py-setuptools_scm@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atomicwrites>=0.1.7:devel/py-atomicwrites@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click>=5.0:devel/py-click@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-log>=0.1.3:devel/py-click-log@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}click-threading>=0.1.2:devel/py-click-threading@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.4.1:www/py-requests@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.4.0:www/py-requests-toolbelt@${PY_FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
@@ -27,6 +27,6 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=	GOOGLE
 
 GOOGLE_DESC=	Enable Google Calendar support
-GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${FLAVOR}
+GOOGLE_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests-oauthlib>=0:www/py-requests-oauthlib@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/deskutils/py-vobject/Makefile b/deskutils/py-vobject/Makefile
index 02a3d739a44f..17860063e5a5 100644
--- a/deskutils/py-vobject/Makefile
+++ b/deskutils/py-vobject/Makefile
@@ -12,8 +12,8 @@ COMMENT=	ICalendar library
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE-2.0.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=2.4.0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/deskutils/pybookreader/Makefile b/deskutils/pybookreader/Makefile
index 39c818d01f82..46e09626131a 100644
--- a/deskutils/pybookreader/Makefile
+++ b/deskutils/pybookreader/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	PyBookReader-${PORTVERSION}
 MAINTAINER=	ufo@februality.com
 COMMENT=	Program for reading e-books
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR}
 
 USES=		python:2.7
 USE_PYTHON=	distutils
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index 867d3c44717a..101a352f4c7c 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libImlib2.so:graphics/imlib2
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib@${FLAVOR}
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:x11-toolkits/py-xlib@${PY_FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:2.7
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 52db3572fd42..9d026c6b71f6 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Modern journal written in Python
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${PY_FLAVOR} \
 		${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${PY_FLAVOR}
 
 USES=		desktop-file-utils gettext python:2.7
 
diff --git a/deskutils/syncthing-gtk/Makefile b/deskutils/syncthing-gtk/Makefile
index 5c021fad9cf7..ce9e9f4a0438 100644
--- a/deskutils/syncthing-gtk/Makefile
+++ b/deskutils/syncthing-gtk/Makefile
@@ -10,9 +10,9 @@ COMMENT=	Python based GUI for Syncthing
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bcrypt>0:security/py-bcrypt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} \
 		libappindicator>=0:devel/libappindicator \
 		syncthing>=0.13:net/syncthing
 
diff --git a/deskutils/taskcoach/Makefile b/deskutils/taskcoach/Makefile
index 6d7e29b95c65..1a3d6ca3708a 100644
--- a/deskutils/taskcoach/Makefile
+++ b/deskutils/taskcoach/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Friendly task manager
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:2.7 shebangfix
diff --git a/deskutils/virt-manager/Makefile b/deskutils/virt-manager/Makefile
index a977822b3b9e..a8bbb27c0bd0 100644
--- a/deskutils/virt-manager/Makefile
+++ b/deskutils/virt-manager/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Toolkit to interact with virtualization capabilities
 LICENSE=	LGPL3
 
 LIB_DEPENDS=	libvirt.so:devel/libvirt
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2@${FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.2:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}libxml2>=2.7.8:textproc/py-libxml2@${PY_FLAVOR} \
 		vte3>=0:x11-toolkits/vte3 \
-		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ipaddr>=0:devel/py-ipaddr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}urlgrabber>=0:www/py-urlgrabber@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}libvirt>=0:devel/py-libvirt@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 		gtk-vnc>=0.4.4:net/gtk-vnc \
 		libvirt-glib>=0.1.9:devel/libvirt-glib \
 		libosinfo>=0:devel/libosinfo \
diff --git a/deskutils/zim/Makefile b/deskutils/zim/Makefile
index 41dd903c711b..d3cfa8f66af9 100644
--- a/deskutils/zim/Makefile
+++ b/deskutils/zim/Makefile
@@ -12,10 +12,10 @@ COMMENT=	Desktop wiki editor
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \
 		xdg-open:devel/xdg-utils \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		desktop-file-utils gettext python:-2.7 shared-mime-info