Convert Python ports to FLAVORS.

  Ports using USE_PYTHON=distutils are now flavored.  They will
  automatically get flavors (py27, py34, py35, py36) depending on what
  versions they support.

  There is also a USE_PYTHON=flavors for ports that do not use distutils
  but need FLAVORS to be set.  A USE_PYTHON=noflavors can be set if
  using distutils but flavors are not wanted.

  A new USE_PYTHON=optsuffix that will add PYTHON_PKGNAMESUFFIX has been
  added to cope with Python ports that did not have the Python
  PKGNAMEPREFIX but are flavored.

  USES=python now also exports a PY_FLAVOR variable that contains the
  current python flavor.  It can be used in dependency lines when the
  port itself is not python flavored.  For example, deskutils/calibre.

  By default, all the flavors are generated.  To only generate flavors
  for the versions in PYTHON2_DEFAULT and PYTHON3_DEFAULT, define
  BUILD_DEFAULT_PYTHON_FLAVORS in your make.conf.

  In all the ports with Python dependencies, the *_DEPENDS entries MUST
  end with the flavor so that the framework knows which to build/use.
  This is done by appending '@${PY_FLAVOR}' after the origin (or
  @${FLAVOR} if in a Python module with Python flavors, as the content
  will be the same).  For example:

    RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}

PR:		223071
Reviewed by:	portmgr, python
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D12464

26 files changed, 84 insertions, 100 deletions

diff --git a/mail/courier-pythonfilter/Makefile b/mail/courier-pythonfilter/Makefile
index cc1de1c9ffab..0f499591b83c 100644
--- a/mail/courier-pythonfilter/Makefile
+++ b/mail/courier-pythonfilter/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Framework for courier filter development in python
 
 BUILD_DEPENDS=	courier-config:mail/courier
 
-USES=		python
-USE_PYTHON=	distutils
+USES=		python:2.7
+USE_PYTHON=	distutils concurrent optsuffix
 NO_ARCH=	yes
 
 MAILOWN=	courier
@@ -60,7 +60,7 @@ OPTIONS_DEFAULT=	DEBUG WHITELIST_RELAY WHITELIST_AUTH
 
 PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${PYSCRIPTSDIR}
 
-CLAMAV_CLAMD_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd
+CLAMAV_CLAMD_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd@${FLAVOR}
 
 post-extract:
 	${MV} ${WRKSRC}/pythonfilter.conf ${WRKSRC}/pythonfilter.conf.sample
diff --git a/mail/isbg/Makefile b/mail/isbg/Makefile
index 0116f95259e8..bc8896472a6d 100644
--- a/mail/isbg/Makefile
+++ b/mail/isbg/Makefile
@@ -12,13 +12,13 @@ COMMENT=	Scan an IMAP inbox for spam using SpamAssassin
 LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	spamassassin:mail/spamassassin \
-		${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt
+		${PYTHON_PKGNAMEPREFIX}docopt>=0.6.1:devel/py-docopt@${FLAVOR}
 
 USE_GITHUB=	yes
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 USES=		python
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	distutils autoplist concurrent optsuffix
 
 .include <bsd.port.mk>
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 86597f31e287..5f0e23d4de1f 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -141,8 +141,8 @@ RUN_DEPENDS+=	mknmz:databases/namazu2
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-Mailman-Cgi-private.py
 .endif
 
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${PY_FLAVOR}
 
 pre-everything::
 	@${ECHO} ""
diff --git a/mail/mailpile/Makefile b/mail/mailpile/Makefile
index d0b1481d91cb..45dd9459a788 100644
--- a/mail/mailpile/Makefile
+++ b/mail/mailpile/Makefile
@@ -12,17 +12,17 @@ COMMENT=	Locally hosted web-browser based mail client
 LICENSE=	AGPLv3+
 LICENSE_FILE=	${WRKSRC}/AGPLv3.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}pgpdump>=0:security/py-pgpdump \
-		${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns \
-		${PYTHON_PKGNAMEPREFIX}spambayes>=0:mail/py-spambayes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=0:devel/py-Jinja2@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pgpdump>=0:security/py-pgpdump@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}spambayes>=0:mail/py-spambayes@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	mailpile
 GH_PROJECT=	Mailpile
 
-USES=		gettext python shebangfix
+USES=		gettext python:2.7 shebangfix
 python_OLD_CMD=	/usr/bin/python2
 SHEBANG_FILES=	mailpile/contrib/gui/gui-o-matic.py \
 		mailpile/contrib/gui/gui-test.sh \
diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index f1b673bedcd6..3a3772f30869 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -62,7 +62,7 @@ NLS_CONFIGURE_ENABLE=	nls
 PAM_CONFIGURE_ENABLE=	pam
 
 PYTHON_BUILD_DEPENDS=	python-config:lang/python
-PYTHON_USES=		python
+PYTHON_USES=		python:2.7
 PYTHON_CONFIGURE_ENABLE=python
 
 BDB_USES=		bdb:48
diff --git a/mail/muttils/Makefile b/mail/muttils/Makefile
index 567104dd8c50..1af3a43d0031 100644
--- a/mail/muttils/Makefile
+++ b/mail/muttils/Makefile
@@ -15,7 +15,7 @@ CONFLICTS=	zh-wenju-[0-9]* talkfilters-[0-9]* reed-[0-9]*
 
 CHANGESET=	8bb26094df06
 WRKSRC=		${WRKDIR}/blacktrash-${PORTNAME}-${CHANGESET}
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 PORTEXAMPLES=	*
diff --git a/mail/offlineimap/Makefile b/mail/offlineimap/Makefile
index 459159666e41..72152daa3c31 100644
--- a/mail/offlineimap/Makefile
+++ b/mail/offlineimap/Makefile
@@ -17,8 +17,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 ## later versions have sqlite3 backend, which is recommended for local storages
 ## with large amount of emails
 ## (add additional variable to use in {BUILD|RUN}_DEPENDS per porter's hb 5.8.2)
-OIMAP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3
+OIMAP_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${FLAVOR}
 BUILD_DEPENDS=	${OIMAP_DEPENDS}
 RUN_DEPENDS=	${OIMAP_DEPENDS}
 
diff --git a/mail/postfix-policyd-spf-python/Makefile b/mail/postfix-policyd-spf-python/Makefile
index be217b2d1585..78940e4cbe68 100644
--- a/mail/postfix-policyd-spf-python/Makefile
+++ b/mail/postfix-policyd-spf-python/Makefile
@@ -15,9 +15,9 @@ COMMENT=	Pure Python Postfix policy daemon for SPF checking
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr \
-		${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf \
-		${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipaddr>0:devel/py-ipaddr@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${FLAVOR}
 
 USES=		python:2.7+
 USE_PYTHON=	autoplist distutils
diff --git a/mail/py-Products.MailHost/Makefile b/mail/py-Products.MailHost/Makefile
index 3de17e61c457..fa79970f0cdc 100644
--- a/mail/py-Products.MailHost/Makefile
+++ b/mail/py-Products.MailHost/Makefile
@@ -13,17 +13,17 @@ COMMENT=	Zope.sendmail integration for Zope 2
 LICENSE=	ZPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl \
-		${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition \
-		${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime \
-		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:devel/py-DocumentTemplate \
-		${PYTHON_PKGNAMEPREFIX}Persistence>0:devel/py-Persistence \
-		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:devel/py-zope.deferredimport \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:mail/py-zope.sendmail
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}AccessControl>0:security/py-AccessControl@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Acquisition>0:devel/py-Acquisition@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}DateTime>0:devel/py-DateTime@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}DocumentTemplate>0:devel/py-DocumentTemplate@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}Persistence>0:devel/py-Persistence@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.deferredimport>0:devel/py-zope.deferredimport@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.sendmail>0:mail/py-zope.sendmail@${FLAVOR}
 
 NO_ARCH=	yes
-USES=		python zip
+USES=		python:2.7 zip
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/mail/py-afew/Makefile b/mail/py-afew/Makefile
index 27cc60735b76..57364d80b85b 100644
--- a/mail/py-afew/Makefile
+++ b/mail/py-afew/Makefile
@@ -11,9 +11,9 @@ COMMENT=	Initial tagging script for notmuch mail
 
 LICENSE=	ISCL
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet \
-	${PYTHON_PKGNAMEPREFIX}notmuch>=0:mail/py-notmuch \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}chardet>=0:textproc/py-chardet@${FLAVOR} \
+	${PYTHON_PKGNAMEPREFIX}notmuch>=0:mail/py-notmuch@${FLAVOR} \
 	notmuch:mail/notmuch
 
 USES=		python
@@ -22,13 +22,13 @@ USE_PYTHON=	autoplist distutils
 OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT=	MANPAGES
 
-MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx
+MANPAGES_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${FLAVOR}
 MANPAGES_PLIST_FILES=	man/man1/afew.1.gz
 
 NO_ARCH=	yes
 
 post-build-MANPAGES-on:
-	${MAKE} -C ${WRKSRC}/docs man
+	${MAKE} -C ${WRKSRC}/docs SPHINXBUILD=sphinx-build-${PYTHON_VER} man
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/docs/build/man/afew.1 ${STAGEDIR}${PREFIX}/man/man1/
diff --git a/mail/py-apolicy/Makefile b/mail/py-apolicy/Makefile
index 49162494b0d8..f9d513f89ae9 100644
--- a/mail/py-apolicy/Makefile
+++ b/mail/py-apolicy/Makefile
@@ -15,9 +15,9 @@ COMMENT=	ACL system for Postfix, as a policy daemon
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy \
-		${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ipy>=0:net-mgmt/py-ipy@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyspf>=0:mail/py-pyspf@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
 USES=		python:2.7
 USE_PYTHON=	autoplist distutils
diff --git a/mail/py-dkimpy/Makefile b/mail/py-dkimpy/Makefile
index df6e5d9056ac..4405e9318d3a 100644
--- a/mail/py-dkimpy/Makefile
+++ b/mail/py-dkimpy/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Python library for DKIM email signing and verification
 
 LICENSE=	ZLIB
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR}
 
 NO_ARCH=	yes
 
diff --git a/mail/py-flufl.bounce/Makefile b/mail/py-flufl.bounce/Makefile
index d3910b6367e4..4ad1b731d281 100644
--- a/mail/py-flufl.bounce/Makefile
+++ b/mail/py-flufl.bounce/Makefile
@@ -11,17 +11,10 @@ COMMENT=	API for detecting the original bouncing email addresses from a bounce m
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atpublic>=0:devel/py-atpublic@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR}
 
 USES=		python:3.4+
 USE_PYTHON=	autoplist distutils
 
-.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/mail/py-fuglu/Makefile b/mail/py-fuglu/Makefile
index d8515ad72a33..9fd4bee2852b 100644
--- a/mail/py-fuglu/Makefile
+++ b/mail/py-fuglu/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Mail scanning daemon for Postfix written in Python
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	postfix:mail/postfix \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${FLAVOR}
 
-USES=		python:2.4+
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 USE_RC_SUBR=	fuglu
@@ -36,13 +36,13 @@ SPAMASSASSIN_DESC=	Use SpamAssassin
 SPF_DESC=		Use SPF (in FuGlu)
 SQL_DESC=		Use SQL
 
-BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup
+BEAUTIFULSOUP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/bs4/__init__.py:www/py-beautifulsoup@${FLAVOR}
 CLAMAV_RUN_DEPENDS=	clamd:security/clamav
-DKIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy
-MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic
+DKIM_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dkimpy>0:mail/py-dkimpy@${FLAVOR}
+MAGIC_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}magic>0:devel/py-magic@${FLAVOR}
 SPAMASSASSIN_RUN_DEPENDS=	spamassassin>=0:mail/spamassassin
-SPF_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf
-SQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10
+SPF_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${FLAVOR}
+SQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>=1.0:databases/py-sqlalchemy10@${FLAVOR}
 
 post-extract:
 	@${REINPLACE_CMD} -e "s|'/etc|'etc|g" ${WRKSRC}/setup.py
diff --git a/mail/py-libgmail/Makefile b/mail/py-libgmail/Makefile
index efcafd00d0dc..42f4bad6c01a 100644
--- a/mail/py-libgmail/Makefile
+++ b/mail/py-libgmail/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Library to provide access to Gmail via Python
 BUILD_DEPENDS=	py*-mechanize>=0:www/py-mechanize
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/mail/py-ppolicy/Makefile b/mail/py-ppolicy/Makefile
index 1573b99ead7f..f70011828e5d 100644
--- a/mail/py-ppolicy/Makefile
+++ b/mail/py-ppolicy/Makefile
@@ -11,10 +11,10 @@ MASTER_SITES=	http://kmlinux.fjfi.cvut.cz/~vokac/activities/ppolicy/download/%SU
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PPolicy is tool for extending Postfix checking capabilities
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>=0:dns/py-dnspython@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR}
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 NO_BUILD=	yes
@@ -27,9 +27,9 @@ SUB_FILES=	pkg-message
 OPTIONS_DEFINE=	GEOIP LDAP MYSQL DOCS
 OPTIONS_DEFAULT=	GEOIP LDAP
 
-GEOIP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP
-MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb
-LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap
+GEOIP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/GeoIP.so:net/py-GeoIP@${FLAVOR}
+MYSQL_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:databases/py-MySQLdb@${FLAVOR}
+LDAP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.3.1:net/py-ldap@${FLAVOR}
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/ppolicy.conf ${STAGEDIR}${PREFIX}/etc
diff --git a/mail/py-premailer/Makefile b/mail/py-premailer/Makefile
index d203fcca71e6..4ae5764b6251 100644
--- a/mail/py-premailer/Makefile
+++ b/mail/py-premailer/Makefile
@@ -12,12 +12,12 @@ COMMENT=	Turns CSS blocks into style attributes
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect \
-		${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils \
-		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml \
-		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
-		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssselect>=0:www/py-cssselect@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cssutils>=0:www/py-cssutils@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
 
 NO_ARCH=	yes
 USES=		python
diff --git a/mail/py-pyspf/Makefile b/mail/py-pyspf/Makefile
index 717519282feb..c9652b11e0dc 100644
--- a/mail/py-pyspf/Makefile
+++ b/mail/py-pyspf/Makefile
@@ -14,8 +14,8 @@ COMMENT=	SPF (Sender Policy Framework) implemented in Python
 
 LICENSE=	PSFL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
 
 NO_ARCH=	yes
 USE_PYTHON=	autoplist concurrent distutils
@@ -28,9 +28,9 @@ SHEBANG_FILES=	spf.py
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} >= 3000
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}py3dns>=0:dns/py-py3dns
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}py3dns>=0:dns/py-py3dns@${FLAVOR}
 .else
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dns>=0:dns/py-dns@${FLAVOR}
 .endif
 
 # Make the tests run as a module
diff --git a/mail/py-spambayes/Makefile b/mail/py-spambayes/Makefile
index 773c439c12f7..d8c441d8d57b 100644
--- a/mail/py-spambayes/Makefile
+++ b/mail/py-spambayes/Makefile
@@ -12,9 +12,9 @@ COMMENT=	Bayesian anti-spam filter written in Python
 
 LICENSE=	PSFL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb \
-		${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns \
-		${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bsddb>0:databases/py-bsddb@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}dns>=2.0:dns/py-dns@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}lockfile>=0.2:devel/py-lockfile@${FLAVOR}
 
 USES=		python:-2.7
 USE_PYTHON=	distutils autoplist
diff --git a/mail/py-zope.sendmail/Makefile b/mail/py-zope.sendmail/Makefile
index c08f903cc46b..3f3f65140290 100644
--- a/mail/py-zope.sendmail/Makefile
+++ b/mail/py-zope.sendmail/Makefile
@@ -13,13 +13,13 @@ COMMENT=	Zope sendmail
 
 LICENSE=	ZPL21
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction \
-		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema \
-		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration \
-		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.i18nmessageid>=0:textproc/py-zope.i18nmessageid@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.interface>=0:devel/py-zope.interface@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.schema>=0:devel/py-zope.schema@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.component>=3.8.0:devel/py-zope.component@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR}
 
 USES=		python:2
 USE_PYTHON=	distutils autoplist
diff --git a/mail/pyzor/Makefile b/mail/pyzor/Makefile
index 817912202183..98b7448e032e 100644
--- a/mail/pyzor/Makefile
+++ b/mail/pyzor/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Collaborative, networked system to detect and block spam
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdbm>=0:databases/py-gdbm@${FLAVOR}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
diff --git a/mail/rss2email2/Makefile b/mail/rss2email2/Makefile
index 21b3f8419a22..a5d279feee23 100644
--- a/mail/rss2email2/Makefile
+++ b/mail/rss2email2/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Emails posts from subscribed RSS/Atom newsfeeds
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text@${PY_FLAVOR}
 
 USES=		python:2 shebangfix
 SHEBANG_FILES=	rss2email.py
diff --git a/mail/rss2email3/Makefile b/mail/rss2email3/Makefile
index e80fe7fc265e..b528ed483911 100644
--- a/mail/rss2email3/Makefile
+++ b/mail/rss2email3/Makefile
@@ -12,8 +12,8 @@ COMMENT=	Emails posts from subscribed RSS/Atom newsfeeds
 LICENSE=	GPLv2 GPLv3
 LICENSE_COMB=	dual
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser \
-		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}feedparser>=5.0.1:textproc/py-feedparser@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}html2text>=3.0.1:textproc/py-html2text@${FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	wking
@@ -26,18 +26,9 @@ CONFLICTS_INSTALL=	py*-rss2email-2.*
 PORTDOCS=	AUTHORS CHANGELOG README
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_MAN} ${WRKSRC}/r2e.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
-.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/mail/spamdb-curses/Makefile b/mail/spamdb-curses/Makefile
index f6c60a5338c9..9b9534d416a0 100644
--- a/mail/spamdb-curses/Makefile
+++ b/mail/spamdb-curses/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/spamdb:mail/spamd
 
-USES=		python
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 .include <bsd.port.mk>
diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile
index 4fcabfded319..0ba4ab4ba6e0 100644
--- a/mail/svnmailer/Makefile
+++ b/mail/svnmailer/Makefile
@@ -11,7 +11,7 @@ PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool to post subversion repository commit information
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python:2 tar:bzip2
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 90d59213d439..45d81ff1c5da 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Python-based SPAM reduction system
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python shebangfix tar:tgz
+USES=		python:2.7 shebangfix tar:tgz
 SHEBANG_FILES=	bin/tmda-* contrib/collectaddys contrib/def2html \
 		contrib/printcdb contrib/printdbm contrib/smtp-check-sender \
 		contrib/tofmipd.init