25 files changed, 104 insertions, 115 deletions

diff --git a/net-im/cjc/Makefile b/net-im/cjc/Makefile
index d49ceda29441..580524358718 100644
--- a/net-im/cjc/Makefile
+++ b/net-im/cjc/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Console Jabber Client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jajcus
diff --git a/net-im/fugu/Makefile b/net-im/fugu/Makefile
index 71aa27cf0a72..9e02b9ad2ebf 100644
--- a/net-im/fugu/Makefile
+++ b/net-im/fugu/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Graphical client for the Gale instant messaging system
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw@${FLAVOR}
 
-USES=		python ssl
+USES=		python:2.7 ssl
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index 5fdcd044aa66..b6ba5342f29c 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Jabber client based on a plugin system
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3 \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp \
-		${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:security/py-openssl@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}python-gnupg>0:security/py-python-gnupg@${PY_FLAVOR}
 
 NO_ARCH=	yes
 USES=		cpe dos2unix gmake localbase pathfix python:2.7 tar:bzip2
@@ -36,9 +36,9 @@ CRYPTO_DESC=	End to end encryption support
 GUPNP_DESC=	UPnP IGD protocol support
 SPELL_DESC=	Spell checking support
 
-AVAHI_RUN_DEPENDS=	avahi-discover:net/py-avahi
-CRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
-DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus
+AVAHI_RUN_DEPENDS=	avahi-discover:net/py-avahi@${PY_FLAVOR}
+CRYPTO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus@${PY_FLAVOR}
 GUPNP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gupnp/__init__.py:net/gupnp-igd
 NLS_USES=		gettext
 SPELL_LIB_DEPENDS=	libgtkspell.so:textproc/gtkspell
diff --git a/net-im/hotot/Makefile b/net-im/hotot/Makefile
index 73a2fa6cea62..492886722b13 100644
--- a/net-im/hotot/Makefile
+++ b/net-im/hotot/Makefile
@@ -15,7 +15,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	lyricat
 GH_PROJECT=	Hotot
 
-USES=		cmake gettext kde:4 python
+USES=		cmake gettext kde:4 python:2.7
 USE_GNOME=	intltool
 INSTALLS_ICONS=	yes
 
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index db3e460b634d..053c0bcdd952 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -26,7 +26,7 @@ INSTALL_TARGET=	install-strip
 .if !defined(PIDGIN_SLAVE)
 # Pidgin slave ports that require the following functionality, must explicitly
 # set these macros themselves.
-USES+=		iconv python shebangfix
+USES+=		iconv python:2.7 shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	libpurple/purple-remote \
 		libpurple/purple-url-handler
diff --git a/net-im/papyon/Makefile b/net-im/papyon/Makefile
index 5a6e225c4372..d3f28c0ceb8e 100644
--- a/net-im/papyon/Makefile
+++ b/net-im/papyon/Makefile
@@ -11,24 +11,19 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Fork of pymsn to support the telepathy MSN connection manager
 
-BUILD_DEPENDS=	py*-openssl>0:security/py-openssl \
-		${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto \
-		${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer \
+BUILD_DEPENDS=	py*-openssl>0:security/py-openssl@${FLAVOR} \
+		${PY_ENUM34} \
+		${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \
+		${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2
-RUN_DEPENDS=	py*-openssl>0:security/py-openssl \
-		${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto \
-		${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer \
+RUN_DEPENDS=	py*-openssl>0:security/py-openssl@${FLAVOR} \
+		${PY_ENUM34} \
+		${PYTHON_SITELIBDIR}/Crypto/Hash/SHA.py:security/py-pycrypto@${FLAVOR} \
+		${LOCALBASE}/lib/gstreamer-0.10/libgstpython.so:multimedia/py-gstreamer@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/farsight.so:net-im/farsight2
 
 USE_GNOME=	pygobject
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 
-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3400
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/pebrot/Makefile b/net-im/pebrot/Makefile
index 03f46f268dbd..667bbbd0c8c7 100644
--- a/net-im/pebrot/Makefile
+++ b/net-im/pebrot/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	SF
 MAINTAINER=	kevlo@FreeBSD.org
 COMMENT=	Text-based MSN messenger client
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net-im/poezio/Makefile b/net-im/poezio/Makefile
index ab224cf43c0f..499534b2e07d 100644
--- a/net-im/poezio/Makefile
+++ b/net-im/poezio/Makefile
@@ -12,17 +12,10 @@ COMMENT=	Console XMPP client
 LICENSE=	ZLIB
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython \
-		${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/dns/__init__.py:dns/py-dnspython@${FLAVOR} \
+		${PYTHON_SITELIBDIR}/sleekxmpp/__init__.py:net-im/py-sleekxmpp@${FLAVOR}
 
 USES=		tar:xz python:3.3+
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist optsuffix
 
-.include <bsd.port.pre.mk>
-
-.if defined(PACKAGE_BUILDING) && !defined(PACKAGE_BUILDING_FLAVORS) && \
-    ${PYTHON_VER} != ${PYTHON_DEFAULT}
-IGNORE=	you have python ${PYTHON_DEFAULT} set as the default, and this needs ${PYTHON_VER}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/proxy65/Makefile b/net-im/proxy65/Makefile
index e5bbe7936b68..31f7342e78b9 100644
--- a/net-im/proxy65/Makefile
+++ b/net-im/proxy65/Makefile
@@ -10,9 +10,9 @@ COMMENT=	XEP-0065 SOCKS5 Bytestreams external component for Jabber
 
 LICENSE=	MIT
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/__init__.py:security/py-openssl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mmatuska
diff --git a/net-im/py-fbmq/Makefile b/net-im/py-fbmq/Makefile
index ebf6033d29f7..8779358e5f30 100644
--- a/net-im/py-fbmq/Makefile
+++ b/net-im/py-fbmq/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Python library for using the Facebook Messenger API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Flask>0:www/py-flask@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net-im/py-jabber/Makefile b/net-im/py-jabber/Makefile
index 9ed2db7a87f8..4bbc8931eabc 100644
--- a/net-im/py-jabber/Makefile
+++ b/net-im/py-jabber/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	jabberpy-${PORTVERSION}-0
 MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Python Jabber library
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 PLIST_FILES=	${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}/jabber.pth
 
diff --git a/net-im/py-jabberbot/Makefile b/net-im/py-jabberbot/Makefile
index 4aa289851958..bce5c6a108d4 100644
--- a/net-im/py-jabberbot/Makefile
+++ b/net-im/py-jabberbot/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Simple Jabber Bot for Python
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy@${FLAVOR}
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/net-im/py-libturpial/Makefile b/net-im/py-libturpial/Makefile
index 8654f5559a69..c1f9079fc1de 100644
--- a/net-im/py-libturpial/Makefile
+++ b/net-im/py-libturpial/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Twitter API
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth \
-		${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests@${FLAVOR}
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/net-im/py-matrix-synapse/Makefile b/net-im/py-matrix-synapse/Makefile
index 048edcfff9d0..76d2f1ffc1c1 100644
--- a/net-im/py-matrix-synapse/Makefile
+++ b/net-im/py-matrix-synapse/Makefile
@@ -15,39 +15,39 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 # Keep the RUN_DEPENDS layout similar to the master/synapse/python_dependencies.py file
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema \
-		${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict \
-		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64 \
-		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson \
-		${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl \
-		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0:security/py-service_identity \
-		${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize \
-		${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt \
-		${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow \
-		${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon \
-		${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson \
-		${PYTHON_PKGNAMEPREFIX}blist>=1.3.6:devel/py-blist \
-		${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2 \
-		${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl \
-		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3.0:devel/py-msgpack-python \
-		${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}jsonschema>=2.5.1:devel/py-jsonschema@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}frozendict>=0.5:devel/py-frozendict@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}unpaddedbase64>=1.1.0:devel/py-unpaddedbase64@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}canonicaljson>=1.0.0:devel/py-canonicaljson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}signedjson>=1.0.0:security/py-signedjson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}service_identity>=16.0:security/py-service_identity@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}openssl>=16.0.0:security/py-openssl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.9:devel/py-pyasn1@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}daemonize>=2.4.2:devel/py-daemonize@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}bcrypt>=0.4:security/py-bcrypt@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pillow>=3.1.1:graphics/py-pillow@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pydenticon>=0.2:devel/py-pydenticon@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}ujson>=1.35:devel/py-ujson@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}blist>=1.3.6:devel/py-blist@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pysaml2>=4.0.2:security/py-pysaml2@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pymacaroons-pynacl>=0.9.3:security/py-pymacaroons-pynacl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}msgpack-python>=0.3.0:devel/py-msgpack-python@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}phonenumbers>=8.2.0:devel/py-phonenumbers@${FLAVOR}
 
 # Conditional requirements that aren't so conditional
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.6:devel/py-matrix-angular-sdk \
-		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr \
-		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}matrix-angular-sdk>=0.6.6:devel/py-matrix-angular-sdk@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
 
 # Dependencies that aren't declared in python_dependencies.py which I have discovered
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson \
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.10.0:devel/py-simplejson@${FLAVOR} \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv \
-		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}virtualenv>=15.0:devel/py-virtualenv@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tox>=2.3.1:devel/py-tox@${FLAVOR}
 
 USES=		python
 USE_GITHUB=	yes
@@ -76,11 +76,11 @@ NO_ARCH=	yes
 OPTIONS_DEFINE=	EMAIL LDAP PGSQL SQLITE
 OPTIONS_DEFAULT=	SQLITE
 EMAIL_DESC=	Email notifications for missed messages
-EMAIL_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2 \
-			${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach
-LDAP_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3
-PGSQL_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2
-SQLITE_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3
+EMAIL_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.8:devel/py-Jinja2@${FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}bleach>=1.4.2:www/py-bleach@${FLAVOR}
+LDAP_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}matrix-synapse-ldap3>=0.1:net/py-matrix-synapse-ldap3@${FLAVOR}
+PGSQL_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
+SQLITE_RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
 
 .include <bsd.port.options.mk>
 
diff --git a/net-im/py-nbxmpp/Makefile b/net-im/py-nbxmpp/Makefile
index abf9ec08974d..9ef8c6817350 100644
--- a/net-im/py-nbxmpp/Makefile
+++ b/net-im/py-nbxmpp/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Non blocking Jabber/XMPP module
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python:2.7+
diff --git a/net-im/py-punjab/Makefile b/net-im/py-punjab/Makefile
index 9911f1bf8514..5385c6cca882 100644
--- a/net-im/py-punjab/Makefile
+++ b/net-im/py-punjab/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HTTP XMPP client interface
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/net-im/py-python-telegram-bot/Makefile b/net-im/py-python-telegram-bot/Makefile
index 258abc2b0034..3bf7eb5bdf42 100644
--- a/net-im/py-python-telegram-bot/Makefile
+++ b/net-im/py-python-telegram-bot/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Not just a Python wrapper around the Telegram Bot API
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}future>0:devel/py-future@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
@@ -22,8 +22,8 @@ USE_PYTHON=	distutils autoplist
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3400
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}certifi>0:security/py-certifi@${FLAVOR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net-im/py-pyxmpp/Makefile b/net-im/py-pyxmpp/Makefile
index 202786462d43..8ccb771b302b 100644
--- a/net-im/py-pyxmpp/Makefile
+++ b/net-im/py-pyxmpp/Makefile
@@ -14,9 +14,9 @@ COMMENT=	Python XMPP library
 LICENSE=	LGPL21 # only
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:security/py-m2crypto \
-		${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}m2crypto>=0.18.2:security/py-m2crypto@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}libxml2>0:textproc/py-libxml2@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jajcus
 
-USES=		python shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	auxtools/*.py examples/*.py tests/*.py utils/*.py
 USE_PYTHON=	distutils autoplist
 
diff --git a/net-im/py-slackclient/Makefile b/net-im/py-slackclient/Makefile
index ab3fdc17bc67..ff9ae77461c8 100644
--- a/net-im/py-slackclient/Makefile
+++ b/net-im/py-slackclient/Makefile
@@ -11,10 +11,10 @@ COMMENT=	Python client for Slack.com
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}websocket-client>0:www/py-websocket-client@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${FLAVOR}
 
 USES=		python:-2.7
 USE_GITHUB=	yes
diff --git a/net-im/py-telepot/Makefile b/net-im/py-telepot/Makefile
index 399f78fd3591..8a606d6330c5 100644
--- a/net-im/py-telepot/Makefile
+++ b/net-im/py-telepot/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Python framework for Telegram Bot API
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}urllib3>0:net/py-urllib3@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python zip
diff --git a/net-im/py-unmessage/Makefile b/net-im/py-unmessage/Makefile
index 0bf946631c6b..da9eefed6f67 100644
--- a/net-im/py-unmessage/Makefile
+++ b/net-im/py-unmessage/Makefile
@@ -14,13 +14,13 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	tor:security/tor \
-		${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib \
-		${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio \
-		${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo \
-		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl \
-		${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip \
-		${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted \
-		${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon
+		${PYTHON_PKGNAMEPREFIX}opuslib>=1.1.0:audio/py-opuslib@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyaudio>=0.2.10:audio/py-pyaudio@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyaxo>=0.7.3:security/py-pyaxo@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pynacl>=1.0.1:security/py-pynacl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyperclip>=1.5.27:devel/py-pyperclip@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=16.6.0:devel/py-twisted@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}txtorcon>=0.19.0:security/py-txtorcon@${FLAVOR}
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
diff --git a/net-im/py-xmpppy-irc/Makefile b/net-im/py-xmpppy-irc/Makefile
index 002c36a12a73..a524559e20f8 100644
--- a/net-im/py-xmpppy-irc/Makefile
+++ b/net-im/py-xmpppy-irc/Makefile
@@ -14,10 +14,11 @@ COMMENT=	Xmpp to irc transport
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \
-		${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}irc>0:irc/py-irc@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
+USE_PYTHON=	flavors
 NO_BUILD=	yes
 NO_ARCH=	yes
 FILES=		irc.py jep0106.py jep0133.py test_jep0106.py
diff --git a/net-im/py-xmpppy-yahoo/Makefile b/net-im/py-xmpppy-yahoo/Makefile
index 51027c5fb799..56d5d74eaa72 100644
--- a/net-im/py-xmpppy-yahoo/Makefile
+++ b/net-im/py-xmpppy-yahoo/Makefile
@@ -18,7 +18,7 @@ EJABBERD_DESC=	transport with ejabberd
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/xmpp/__init__.py:net-im/py-xmpppy \
 		${PYTHON_SITELIBDIR}/DNS/__init__.py:dns/py-dns
 
-USES=		python
+USES=		python:2.7
 NO_BUILD=	yes
 FILES=		adhoc.py config.py jep0133.py roomlist.py xmlconfig.py \
 		yahoo_helpers.py avatar.py htmlutils.py migratespool.py toolbox.py \
diff --git a/net-im/py-xmpppy/Makefile b/net-im/py-xmpppy/Makefile
index f39e8001eeb9..851d57e605a9 100644
--- a/net-im/py-xmpppy/Makefile
+++ b/net-im/py-xmpppy/Makefile
@@ -12,9 +12,9 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}rc1
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Python library that provides easy scripting with Jabber
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=1.7.1:dns/py-dnspython@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 post-patch:
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index d43caa3dc3d0..5dabdce36ccc 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Twitter client written in Python
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify \
-	${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:devel/py-setproctitle \
-	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2 \
-	${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:net-im/py-libturpial
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:devel/py-babel@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}setproctitle>=1.1.7:devel/py-setproctitle@${FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.7.1:devel/py-Jinja2@${FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}libturpial>=1.7.0:net-im/py-libturpial@${FLAVOR}
 
 USES=		pyqt:4 python:2
 USE_PYQT=	core_run gui_run network_run phonon_run webkit_run