Reduce dependency on the python2 metaport

PR: 225752 Submitted by: Yasuhiro KIMURA
author: Antoine Brodin <antoine@FreeBSD.org> 2018-02-19 11:10:43 +0000
committer: Antoine Brodin <antoine@FreeBSD.org> 2018-02-19 11:10:43 +0000
commit: f7455240e3b2acb3cd4804dac9a3afe2582a0a96 (patch)
tree: 94eaef37ab07d82e499ae4cafabe202ea2ed0525
parent: 6db4531ff6ac4b156bdc1499488964f1c2551e7f (diff)
download: ports-f7455240e3b2acb3cd4804dac9a3afe2582a0a96.tar.gz
ports-f7455240e3b2acb3cd4804dac9a3afe2582a0a96.zip
440 files changed, 887 insertions, 692 deletions
diff --git a/accessibility/caribou/Makefile b/accessibility/caribou/Makefile
index 89a1cf226562..25a5ed853687 100644
--- a/accessibility/caribou/Makefile
+++ b/accessibility/caribou/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	caribou
 PORTVERSION=	0.4.21
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,7 +19,7 @@ LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter \
 		libxklavier.so:x11/libxklavier
 RUN_DEPENDS=	py2?-atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR}
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig python:2 \
+USES=		gettext gmake gnome libtool pathfix pkgconfig python:2.7 \
 		shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxml2 \
 		libxslt:build pygobject3
diff --git a/accessibility/py-papi/Makefile b/accessibility/py-papi/Makefile
index 6c5d9e929211..c1dfe70dff44 100644
--- a/accessibility/py-papi/Makefile
+++ b/accessibility/py-papi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	papi
 PORTVERSION=	0.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility devel python
 MASTER_SITES=	SF/ocemp/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	ATK accessibility wrapper for python
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig python:2
+USES=		pkgconfig python:2.7
 USE_GNOME=	atk
 USE_PYTHON=	autoplist distutils
 
diff --git a/audio/alsa-lib/Makefile b/audio/alsa-lib/Makefile
index 60ff39622346..e58627696bab 100644
--- a/audio/alsa-lib/Makefile
+++ b/audio/alsa-lib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	alsa-lib
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.alsa-project.org/pub/lib/ \
 		GENTOO
@@ -27,7 +28,7 @@ OPTIONS_DEFINE=	PYTHON
 OPTIONS_SUB=	yes
 
 PYTHON_CONFIGURE_ENABLE=python
-PYTHON_USES=	python:2
+PYTHON_USES=	python:2.7
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e '/LIBS/ { s/-ldl//g; s/-lrt//g; }' \
diff --git a/audio/boodler/Makefile b/audio/boodler/Makefile
index a6e286edb1e3..cb57985a77ba 100644
--- a/audio/boodler/Makefile
+++ b/audio/boodler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	boodler
 PORTVERSION=	1.5.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
 MASTER_SITES=	http://www.eblong.com/zarf/boodler/
 DISTFILES=	boodler-153.tar.gz boodler-snd-021902.tar.gz
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LGPL
 RESTRICTED=	Not for commercial use
 RESTRICTED_FILES=	boodler-snd-021902.tar.gz
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.py
diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile
index b372404ca509..cfdc371cfa56 100644
--- a/audio/csound6/Makefile
+++ b/audio/csound6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	csound
 PORTVERSION=	6.06
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	audio lang
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION}
 PKGNAMESUFFIX=	6
@@ -22,7 +22,7 @@ BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 LIB_DEPENDS=	libsamplerate.so:audio/libsamplerate \
 		libsndfile.so:audio/libsndfile
 
-USES=		alias bison cmake:outsource,noninja eigen:3 localbase python:2
+USES=		alias bison cmake:outsource,noninja eigen:3 localbase python:2.7
 # math/gmm++ requires c++11
 USE_CXXSTD=	c++11
 CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
diff --git a/audio/dir2ogg/Makefile b/audio/dir2ogg/Makefile
index 7f89dabe4ec8..044540129bae 100644
--- a/audio/dir2ogg/Makefile
+++ b/audio/dir2ogg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dir2ogg
 PORTVERSION=	0.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://jak-linux.org/projects/dir2ogg/${PORTVERSION}/
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	faad:audio/faad \
 		mplayer:multimedia/mplayer \
 		oggenc:audio/vorbis-tools
 
-USES=		python:2,run shebangfix
+USES=		python:2.7,run shebangfix
 
 SHEBANG_FILES=	${PORTNAME}
 NO_BUILD=	yes
diff --git a/audio/exaile/Makefile b/audio/exaile/Makefile
index 5ed5d53655ef..c26bb9bf7e47 100644
--- a/audio/exaile/Makefile
+++ b/audio/exaile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	exaile
 PORTVERSION=	3.4.5
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://github.com/exaile/exaile/releases/download/${PORTVERSION}/
 
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen@${PY_FLAVOR}
 
 MAKE_ENV+=	PYTHON2_CMD=${PYTHON_CMD} XDGCONFDIR=${PREFIX}/etc/xdg
-USES=		desktop-file-utils gmake python:2
+USES=		desktop-file-utils gmake python:2.7
 USE_GNOME=	pygtk2 librsvg2
 USE_GSTREAMER=	good faad python
 
diff --git a/audio/jokosher/Makefile b/audio/jokosher/Makefile
index 21b87c881531..66c6285d3af4 100644
--- a/audio/jokosher/Makefile
+++ b/audio/jokosher/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	jokosher
 PORTVERSION=	0.11.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio
 MASTER_SITES=	http://launchpadlibrarian.net/43860543/
 
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR}
 
-USES=		desktop-file-utils python:2 shared-mime-info
+USES=		desktop-file-utils python:2.7 shared-mime-info
 USE_PYTHON=	distutils
 USE_GSTREAMER=	gnonlin good python
 INSTALLS_ICONS=	yes
diff --git a/audio/mbox/Makefile b/audio/mbox/Makefile
index 490c3fa6f0b0..06608147ad32 100644
--- a/audio/mbox/Makefile
+++ b/audio/mbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mbox
 PORTVERSION=	0.7.2
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	audio
 MASTER_SITES=	http://www.mbox.wz.cz/src/
 
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ogg>0:audio/py-ogg@${FLAVOR} \
 		mplayer:multimedia/mplayer
 
 WRKSRC=		${WRKDIR}/mBox-${PORTVERSION}
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	autoplist distutils
 USE_WX=		3.0+
 WX_COMPS=	python
diff --git a/audio/mpdbrowser/Makefile b/audio/mpdbrowser/Makefile
index 64e68c75c1d9..79becf1343bb 100644
--- a/audio/mpdbrowser/Makefile
+++ b/audio/mpdbrowser/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpdbrowser
 PORTVERSION=	0.9.20
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio python
 MASTER_SITES=	http://mpdbrowser.tuxfamily.org/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:audio/py-mpd@${FLAVOR}
 
-USES=		gettext iconv python:2 tar:tgz
+USES=		gettext iconv python:2.7 tar:tgz
 USE_GNOME=	intltool pygtk2
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	mpdBrowser
diff --git a/audio/puddletag/Makefile b/audio/puddletag/Makefile
index 01bc336aa543..4ae07a817c2b 100644
--- a/audio/puddletag/Makefile
+++ b/audio/puddletag/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	puddletag
 PORTVERSION=	1.2.0
 DISTVERSIONPREFIX=v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 
 MAINTAINER=	pawel@FreeBSD.org
@@ -21,7 +21,7 @@ RUN_DEPENDS=	chromaprint>=0.4:audio/chromaprint \
 USE_GITHUB=	yes
 GH_ACCOUNT=	keithgg
 
-USES=		python:2 pyqt:4
+USES=		python:2.7 pyqt:4
 USE_PYTHON=	autoplist distutils
 USE_PYQT=	gui_run svg_run
 WRKSRC_SUBDIR=	source
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index ec0f44a1be45..f671c2c4f828 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ao
 PORTVERSION=	0.82
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio python
 MASTER_SITES=	http://ekyo.nerim.net/software/pyogg/ \
 		http://www.sourcefiles.org/Programming/Development/Modules/Python/
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libao.so:audio/libao
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 do-configure:
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
index 4b7f8da2df80..3be991e2c5a3 100644
--- a/audio/py-cddb/Makefile
+++ b/audio/py-cddb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cddb
 PORTVERSION=	1.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 MASTER_SITES=	SF/${PORTNAME}-py/${PORTNAME}-py/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ COMMENT=	Python module to fetch information on audio CDs from CDDB
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist pythonprefix
 
 post-install:
diff --git a/audio/py-hsaudiotag/Makefile b/audio/py-hsaudiotag/Makefile
index 3f19b83d5a6f..1c240541e574 100644
--- a/audio/py-hsaudiotag/Makefile
+++ b/audio/py-hsaudiotag/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hsaudiotag
 PORTVERSION=	1.1.1
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Read metdata (tags) of mp3, mp4, wma, ogg, flac and aiff files
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/audio/py-id3/Makefile b/audio/py-id3/Makefile
index 04839a54daf8..75be3784945d 100644
--- a/audio/py-id3/Makefile
+++ b/audio/py-id3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	id3
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	SF/${PORTNAME}-py/${PORTNAME}-py/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module for retrieving and setting ID3 tags on MP3 files
 
 WRKSRC=		${WRKDIR}/id3-py-${PORTVERSION}
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist pythonprefix
 
 .include <bsd.port.mk>
diff --git a/audio/py-karaoke/Makefile b/audio/py-karaoke/Makefile
index 1728e4acf80a..428e31efccc0 100644
--- a/audio/py-karaoke/Makefile
+++ b/audio/py-karaoke/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	karaoke
 PORTVERSION=	0.7.5
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	audio python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ RUN_DEPENDS=	dejavu>0:x11-fonts/dejavu \
 		${PYGAME} \
 		${PYNUMPY}
 
-USES=		compiler:c++11-lib desktop-file-utils iconv python:2 shebangfix zip
+USES=		compiler:c++11-lib desktop-file-utils iconv python:2.7 shebangfix zip
 SHEBANG_FILES=	install/pykaraoke_mini install/pykar install/pykaraoke \
 		install/pycdg install/pympg
 USE_SDL=	sdl
diff --git a/audio/py-musicbrainz2/Makefile b/audio/py-musicbrainz2/Makefile
index b64a252b8007..d018cb0ce8cd 100644
--- a/audio/py-musicbrainz2/Makefile
+++ b/audio/py-musicbrainz2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	musicbrainz2
 PORTVERSION=	0.7.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio python
 MASTER_SITES=	ftp://ftp.musicbrainz.org/pub/musicbrainz/python-musicbrainz2/ \
 		http://ftp.osuosl.org/pub/musicbrainz/python-musicbrainz2/
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
 LIB_DEPENDS=	libdiscid.so:audio/libdiscid
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_PKGNAME=	python-musicbrainz2
 
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index a0ee08623044..dc5cc7aeeb35 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ogg
 PORTVERSION=	1.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	audio python
 MASTER_SITES=	http://ekyo.nerim.net/software/pyogg/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	LGPL20
 
 LIB_DEPENDS=	libogg.so:audio/libogg
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 do-configure:
diff --git a/audio/py-shout/Makefile b/audio/py-shout/Makefile
index 5e34edb70f6a..5a46198f37a9 100644
--- a/audio/py-shout/Makefile
+++ b/audio/py-shout/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	shout
 PORTVERSION=	0.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	audio python
 MASTER_SITES=	http://downloads.us.xiph.org/releases/libshout/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libshout.so:audio/libshout
 
 OPTIONS_DEFINE=	EXAMPLES
 
-USES=		pkgconfig python:2 shebangfix
+USES=		pkgconfig python:2.7 shebangfix
 SHEBANG_FILES=	example.py
 USE_PYTHON=	autoplist distutils
 
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index aa599215b80e..4212366d74bb 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vorbis
 PORTVERSION=	1.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio python
 MASTER_SITES=	http://ekyo.nerim.net/software/pyogg/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ogg/_ogg.so:audio/py-ogg@${FLAVOR}
 LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-patch:
diff --git a/audio/pytone/Makefile b/audio/pytone/Makefile
index 83d92e4e5a41..34805efa44bd 100644
--- a/audio/pytone/Makefile
+++ b/audio/pytone/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pytone
 PORTVERSION=	3.0.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio python
 MASTER_SITES=	http://www.luga.de/pytone/download/ \
 		http://redundancy.redundancy.org/mirror/
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libao.so:audio/libao
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>0:audio/py-mutagen@${FLAVOR}
 
-USES=		ncurses python:2
+USES=		ncurses python:2.7
 USE_PYTHON=	autoplist distutils
 
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/audio/soundconverter/Makefile b/audio/soundconverter/Makefile
index 11b89c0f31bb..437e3c3f5f17 100644
--- a/audio/soundconverter/Makefile
+++ b/audio/soundconverter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	soundconverter
 PORTVERSION=	2.1.6
+PORTREVISION=	1
 CATEGORIES=	audio python
 MASTER_SITES=	https://launchpad.net/soundconverter/trunk/2.1.6/+download/ \
 		http://BSDforge.com/projects/source/audio/soundconverter/
@@ -16,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gstreamer>=0.10:multimedia/py-gstreamer@${PY_FLAVOR}
 
 NO_ARCH=	yes
-USES=		desktop-file-utils gmake python:2 shebangfix tar:xz
+USES=		desktop-file-utils gmake python:2.7 shebangfix tar:xz
 
 SHEBANG_FILES=	bin/soundconverter.py
 
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index edc8c7a1e2ef..f03cf742dfc8 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	biopython
 PORTVERSION=	1.70
+PORTREVISION=	1
 CATEGORIES=	biology python
 MASTER_SITES=	http://www.biopython.org/DIST/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Collection of Python modules for bioinformatics
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS=	${PYNUMPY}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	REPORTLAB
diff --git a/cad/brickutils/Makefile b/cad/brickutils/Makefile
index e566b6d2a5af..3d228748c7bc 100644
--- a/cad/brickutils/Makefile
+++ b/cad/brickutils/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	brickutils
 PORTVERSION=	0.1.6.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-obsolete/ \
 		SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-obsolete/:docs \
@@ -25,7 +25,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:cad/ldraw \
 WRKSRC=		${WRKDIR}/BrickUtils-${PORTVERSION}
 
 NO_ARCH=	yes
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_GNOME=	pygtk2
 SHEBANG_FILES=	pyBrickUtils.py \
 		BrickUtils/*.py
diff --git a/chinese/bg5pdf/Makefile b/chinese/bg5pdf/Makefile
index 4d0ae210cef6..e8cbc56c26c1 100644
--- a/chinese/bg5pdf/Makefile
+++ b/chinese/bg5pdf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bg5pdf
 PORTVERSION=	1.0.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	chinese print
 MASTER_SITES=	LOCAL/chinsan
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libpdf.so:print/pdflib
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	bg5pdf gbpdf
 python_OLD_CMD=	"/usr/bin/env /usr/bin/python"
 
diff --git a/converters/py-iconv/Makefile b/converters/py-iconv/Makefile
index bd7dd4041b86..96c9ce017ab3 100644
--- a/converters/py-iconv/Makefile
+++ b/converters/py-iconv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	iconv
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	converters python
 MASTER_SITES=	LOCAL/perky
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ DIST_SUBDIR=	python
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Iconv wrapper with Unicode codec for Python
 
-USES=		iconv python:2
+USES=		iconv python:2.7
 USE_PYTHON=	autoplist distutils
 
 .if empty(ICONV_LIB)
diff --git a/databases/gadfly/Makefile b/databases/gadfly/Makefile
index a0cb37985ef5..a70bbef320df 100644
--- a/databases/gadfly/Makefile
+++ b/databases/gadfly/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gadfly
 PORTVERSION=	1.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	databases
 MASTER_SITES=	SF
 
@@ -12,7 +12,7 @@ COMMENT=	SQL database written in Python
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/kjbuckets.so:devel/py-kjbuckets@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/databases/grass7/Makefile b/databases/grass7/Makefile
index 073c8d9c4695..18917d09bbce 100644
--- a/databases/grass7/Makefile
+++ b/databases/grass7/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	grass
 PORTVERSION=	7.2.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases geography
 MASTER_SITES=	http://grass.osgeo.org/%SUBDIR%/ \
 		http://grass.cict.fr/%SUBDIR%/ \
@@ -36,7 +36,7 @@ LIB_DEPENDS=	libgdal.so:graphics/gdal \
 		libgeos.so:graphics/geos
 RUN_DEPENDS=	bash:shells/bash
 
-USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2 \
+USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2.7 \
 		readline shebangfix tk
 SHEBANG_LANG=	nviz
 nviz_OLD_CMD=	nviz
diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
index a4d0166770cd..389baca46a43 100644
--- a/databases/kdb/Makefile
+++ b/databases/kdb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		kdb
 DISTVERSION=		3.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=		databases kde
 MASTER_SITES=		KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=		KDE/${PORTNAME}
@@ -12,7 +12,7 @@ COMMENT=		Database connectivity and creation framework
 
 LIB_DEPENDS=		libicuuc.so:devel/icu
 
-USES=			cmake:outsource gettext kde:5 python:2 tar:xz
+USES=			cmake:outsource gettext kde:5 python:2.7 tar:xz
 USE_KDE=		coreaddons ecm i18n
 USE_QT5=		core gui network widgets xml \
 			buildtools_build qmake_build
diff --git a/databases/mtools-mongodb/Makefile b/databases/mtools-mongodb/Makefile
index a3a17b2a5bfc..917ba938f882 100644
--- a/databases/mtools-mongodb/Makefile
+++ b/databases/mtools-mongodb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mtools
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,6 +19,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}psutil>=2.0:sysutils/py-psutil@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR}
 
 USE_PYTHON=	autoplist distutils
-USES=		python:2
+USES=		python:2.7
 
 .include <bsd.port.mk>
diff --git a/databases/ntdb/Makefile b/databases/ntdb/Makefile
index f9ae2f308b74..63b9db5bb4dd 100644
--- a/databases/ntdb/Makefile
+++ b/databases/ntdb/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=		ntdb
 PORTVERSION=		1.0
-PORTREVISION=		1
+PORTREVISION=		2
 PORTEPOCH=		0
 CATEGORIES=		databases
 MASTER_SITES=		SAMBA/tdb
@@ -35,7 +35,7 @@ MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 .if defined(NO_PYTHON)
 CONFIGURE_ARGS+=	--disable-python
 .else
-USES+=			python:2
+USES+=			python:2.7
 PLIST_FILES+=		%%PYTHON_SITELIBDIR%%/ntdb.so
 .endif
 
diff --git a/databases/pgtune/Makefile b/databases/pgtune/Makefile
index eadeac402b4f..d43ca2f3201c 100644
--- a/databases/pgtune/Makefile
+++ b/databases/pgtune/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgtune
 PORTVERSION=	0.9.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/2449/ \
 		https://www.glenbarber.us/ports/${CATEGORIES}/${PORTNAME}/
@@ -14,7 +14,7 @@ COMMENT=	Postgresql.conf tuning tips based on hardware and load type
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-USES=		python:2,run shebangfix
+USES=		python:2.7,run shebangfix
 SHEBANG_FILES=	${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/databases/pgworksheet/Makefile b/databases/pgworksheet/Makefile
index cfdb48e27a1f..b6aa3faf92af 100644
--- a/databases/pgworksheet/Makefile
+++ b/databases/pgworksheet/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pgworksheet
 PORTVERSION=	1.9
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/1695/
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pyPgSQL/libpq/__init__.py:databases/py-pyPgSQL@${FLAVOR}
 
-USES=		pgsql python:2 tar:bzip2
+USES=		pgsql python:2.7 tar:bzip2
 USE_GNOME=	pygtk2
 USE_PYTHON=	distutils autoplist
 
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 1475fd228dda..a2a3bf25be6d 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	MySQLdb
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Access a MySQL database through Python
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/GPL-2.0
 
-USES=		mysql python:2
+USES=		mysql python:2.7
 USE_PYTHON=	autoplist distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	farcepest
diff --git a/databases/py-cdb/Makefile b/databases/py-cdb/Makefile
index 6c91a8bc14cd..a7f0575af831 100644
--- a/databases/py-cdb/Makefile
+++ b/databases/py-cdb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cdb
 PORTVERSION=	0.34
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	http://pilcrow.madison.wi.us/python-${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT=	Python interface to DJB's constant database library
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
diff --git a/databases/py-forgetsql/Makefile b/databases/py-forgetsql/Makefile
index a70c7d5f3350..e1b56a3ed2c3 100644
--- a/databases/py-forgetsql/Makefile
+++ b/databases/py-forgetsql/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	forgetsql
 PORTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ COMMENT=	Python module for object-oriented access to SQL databases
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/databases/py-htsql-mysql/Makefile b/databases/py-htsql-mysql/Makefile
index 0cf5a3875a27..b516f716797d 100644
--- a/databases/py-htsql-mysql/Makefile
+++ b/databases/py-htsql-mysql/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	htsql-mysql
 PORTVERSION=	2.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ LICENSE=	AGPLv3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MySQLdb>0:databases/py-MySQLdb@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-htsql-pgsql/Makefile b/databases/py-htsql-pgsql/Makefile
index a00a7a854fcf..1418c330fcac 100644
--- a/databases/py-htsql-pgsql/Makefile
+++ b/databases/py-htsql-pgsql/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	htsql-pgsql
 PORTVERSION=	2.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ LICENSE=	AGPLv3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}htsql>2.3:databases/py-htsql@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psycopg2>0:databases/py-psycopg2@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-htsql/Makefile b/databases/py-htsql/Makefile
index 6984eaeab009..9bf36c95fc30 100644
--- a/databases/py-htsql/Makefile
+++ b/databases/py-htsql/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	htsql
 PORTVERSION=	2.3.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	Database Query Language (Core & SQLite Backend)
 
 LICENSE=	AGPLv3
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
diff --git a/databases/py-mysql2pgsql/Makefile b/databases/py-mysql2pgsql/Makefile
index d18e7af9ba32..30a82929fe80 100644
--- a/databases/py-mysql2pgsql/Makefile
+++ b/databases/py-mysql2pgsql/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	mysql2pgsql
 PORTVERSION=	0.1.6
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}MySQLdb>=1.2.3:databases/py-MySQLdb@${FLAVOR
 		${PYTHON_PKGNAMEPREFIX}yaml>=3.10.0:devel/py-yaml@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 USE_GITHUB=	yes
diff --git a/databases/py-oops/Makefile b/databases/py-oops/Makefile
index 844d64deac64..3cfdf72ff91f 100644
--- a/databases/py-oops/Makefile
+++ b/databases/py-oops/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	oops
 PORTVERSION=	0.9.1
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	SF/pyobjfs/OOPS-Python%20Datastore/${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object Oriented Database Library For Persistent Storage in Python
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/py-pg8000/Makefile b/databases/py-pg8000/Makefile
index ffc47f6bf707..cd240a04da09 100644
--- a/databases/py-pg8000/Makefile
+++ b/databases/py-pg8000/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pg8000
 PORTVERSION=	1.11.0
+PORTREVISION=	1
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Pure-Python Interface to the PostgreSQL Database
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
diff --git a/databases/py-rrdtool_lgpl/Makefile b/databases/py-rrdtool_lgpl/Makefile
index 57b74c648b9c..23f89a4471d1 100644
--- a/databases/py-rrdtool_lgpl/Makefile
+++ b/databases/py-rrdtool_lgpl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rrdtool_lgpl
 PORTVERSION=	1.0b1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases python
 MASTER_SITES=	SF/py-rrdtool/py-rrdtool/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	librrd.so:databases/rrdtool
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 LIBDIR?=	${LOCALBASE}/lib # directory where librrd.so lives
diff --git a/databases/py-umemcache/Makefile b/databases/py-umemcache/Makefile
index 3e56470c3be8..6cb19bfec504 100644
--- a/databases/py-umemcache/Makefile
+++ b/databases/py-umemcache/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	umemcache
 PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Memcache client written in highly optimized C++ with Python bindings
 
 LICENSE=	BSD4CLAUSE
 
-USES=		dos2unix python:2 zip
+USES=		dos2unix python:2.7 zip
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile
index 7c16c09f0140..844b3b9ed7a3 100644
--- a/databases/skytools/Makefile
+++ b/databases/skytools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	skytools
 PORTVERSION=	3.2
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/3622/
 
@@ -10,7 +11,7 @@ MAINTAINER=	sam@cassiba.com
 COMMENT=	PostgreSQL tools from Skype: walshipping, queueing, replication
 
 GNU_CONFIGURE=	yes
-USES=		gmake python:2 shebangfix pgsql
+USES=		gmake python:2.7 shebangfix pgsql
 
 SHEBANG_FILES=	setup_pkgloader.py setup_skytools.py \
 		scripts/catsql.py scripts/data_maintainer.py \
diff --git a/databases/zodb3/Makefile b/databases/zodb3/Makefile
index 3a9d72cfbfd0..a069b7a01fe2 100644
--- a/databases/zodb3/Makefile
+++ b/databases/zodb3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zodb
 PORTVERSION=	3.10.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	CHEESESHOP
 PKGNAMESUFFIX=	-py${PYTHON_SUFFIX}
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zclockfile>=1.0.0:devel/py-zclockfile@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.event>=1.0.0:devel/py-zope.event@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 095240926ad9..53f2b8c9e4a6 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	calibre
 PORTVERSION=	3.17.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 
@@ -48,7 +49,7 @@ RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		pdftohtml:graphics/poppler-utils
 
 USES=		desktop-file-utils gettext-runtime gnome localbase:ldflags pkgconfig \
-		python:2 pyqt:5 shared-mime-info shebangfix ssl tar:xz
+		python:2.7 pyqt:5 shared-mime-info shebangfix ssl tar:xz
 USE_RC_SUBR=	calibre
 EXTRACT_BEFORE_ARGS=	-x -s '/^calibre/~-src/' -f
 SHEBANG_GLOB=	*.sh *.py
diff --git a/deskutils/conduit/Makefile b/deskutils/conduit/Makefile
index c4240ea32b6b..ca45068ad417 100644
--- a/deskutils/conduit/Makefile
+++ b/deskutils/conduit/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	conduit
 PORTVERSION=	0.3.17
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:graphics/py-goocanvas@${PY_
 		xdg-open:devel/xdg-utils
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pathfix pkgconfig python:2 \
+USES=		gettext gmake pathfix pkgconfig python:2.7 \
 		shebangfix
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/deskutils/gnome-tweak-tool/Makefile b/deskutils/gnome-tweak-tool/Makefile
index 16fcd39181d7..7fc2b751bb00 100644
--- a/deskutils/gnome-tweak-tool/Makefile
+++ b/deskutils/gnome-tweak-tool/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gnome-tweak-tool
 PORTVERSION=	3.18.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 
@@ -15,7 +15,7 @@ RUN_DEPENDS=	gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gettext gmake gnome pathfix pkgconfig python:2 \
+USES=		gettext gmake gnome pathfix pkgconfig python:2.7 \
 		shebangfix tar:xz
 USE_GNOME=	gtk30 pygobject3 intlhack
 GNU_CONFIGURE=	yes
diff --git a/deskutils/griffith/Makefile b/deskutils/griffith/Makefile
index 5ed8d5566b41..b5f40668fbfb 100644
--- a/deskutils/griffith/Makefile
+++ b/deskutils/griffith/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	griffith
 PORTVERSION=	0.13
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpadlibrarian.net/87859599/
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab1>=1.19:print/py-reportlab1@${PY_FLAVOR}
 
-USES=		gmake gettext python:2 shebangfix tar:xz
+USES=		gmake gettext python:2.7 shebangfix tar:xz
 SHEBANG_FILES=	griffith
 USE_GNOME=	pygtk2
 NO_BUILD=	yes
diff --git a/deskutils/gtg/Makefile b/deskutils/gtg/Makefile
index b68eea6367a9..17202b0fa332 100644
--- a/deskutils/gtg/Makefile
+++ b/deskutils/gtg/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	gtg
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	deskutils gnome python
 MASTER_SITES=	http://launchpadlibrarian.net/157500472/
 
@@ -16,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR} \
 		xset:x11/xset
 
 USE_GNOME=	pygobject pygtk2
-USES=		gettext desktop-file-utils python:2 shebangfix
+USES=		gettext desktop-file-utils python:2.7 shebangfix
 INSTALLS_ICONS=	yes
 SHEBANG_FILES=	${WRKSRC}/gtcli_bash_completion
 USE_PYTHON=	distutils autoplist
diff --git a/deskutils/ljcharm/Makefile b/deskutils/ljcharm/Makefile
index 90d8e2ebf69c..a3f0bce4d1da 100644
--- a/deskutils/ljcharm/Makefile
+++ b/deskutils/ljcharm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	charm
 PORTVERSION=	1.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils net
 MASTER_SITES=	SF/lj${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -13,7 +13,7 @@ COMMENT=	Menu-driven python-based livejournal client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/deskutils/mozo/Makefile b/deskutils/mozo/Makefile
index c7485d9ce366..88bc111a8831 100644
--- a/deskutils/mozo/Makefile
+++ b/deskutils/mozo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mozo
 PORTVERSION=	1.18.0
+PORTREVISION=	1
 CATEGORIES=	deskutils mate
 MASTER_SITES=	MATE
 DIST_SUBDIR=	mate
@@ -13,7 +14,7 @@ COMMENT=	Editor for the freedesktop.org menu specification
 PORTSCOUT=	limitw:1,even
 
 USES=		gettext gmake localbase pathfix pkgconfig \
-		python:2 tar:xz
+		python:2.7 tar:xz
 USE_MATE=	menus
 USE_GNOME=	gtk30 intltool pygobject3
 GNU_CONFIGURE=	yes
diff --git a/deskutils/rednotebook/Makefile b/deskutils/rednotebook/Makefile
index 4f4163c40d64..52db3572fd42 100644
--- a/deskutils/rednotebook/Makefile
+++ b/deskutils/rednotebook/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rednotebook
 PORTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/rednotebook
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR} \
 		${LOCALBASE}/bin/xdg-open:devel/xdg-utils \
 		${PYTHON_PKGNAMEPREFIX}chardet>0:textproc/py-chardet@${FLAVOR}
 
-USES=		desktop-file-utils gettext python:2
+USES=		desktop-file-utils gettext python:2.7
 
 INSTALLS_ICONS=	yes
 USE_GNOME=	pygtk2
diff --git a/deskutils/semantik/Makefile b/deskutils/semantik/Makefile
index 2e0bcf0aa339..02123a5046e6 100644
--- a/deskutils/semantik/Makefile
+++ b/deskutils/semantik/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	semantik
 DISTVERSION=	0.9.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://ftp.waf.io/pub/release/ \
 		http://www.freehackers.org/~tnagy/release/
@@ -12,7 +12,7 @@ COMMENT=	KDE mind mapping tool
 
 LICENSE=	GPLv3
 
-USES=		kde:4 pkgconfig python:2 shebangfix tar:bzip2 waf \
+USES=		kde:4 pkgconfig python:2.7 shebangfix tar:bzip2 waf \
 		gettext shared-mime-info
 USE_KDE=	kdelibs
 USE_OCAML=	yes
diff --git a/deskutils/superkaramba/Makefile b/deskutils/superkaramba/Makefile
index b3fd518caab0..76d62734daa2 100644
--- a/deskutils/superkaramba/Makefile
+++ b/deskutils/superkaramba/Makefile
@@ -2,13 +2,13 @@
 
 PORTNAME=	superkaramba
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Widget framework for KDE
 
-USES=		cmake:outsource kde:4 python:2 tar:xz
+USES=		cmake:outsource kde:4 python:2.7 tar:xz
 USE_KDE=	kdelibs automoc4 qimageblitz
 USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
diff --git a/deskutils/tnote/Makefile b/deskutils/tnote/Makefile
index b79f6052a8d2..a35a4b7a58cb 100644
--- a/deskutils/tnote/Makefile
+++ b/deskutils/tnote/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tnote
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME}
 
@@ -12,7 +12,7 @@ COMMENT=	Small note taking program for the terminal
 
 LICENSE=	GPLv3
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_PYTHON=	distutils
 
 SHEBANG_FILES=	tnote
diff --git a/devel/bbfreeze-loader/Makefile b/devel/bbfreeze-loader/Makefile
index b355305a65ee..f5f571175732 100644
--- a/devel/bbfreeze-loader/Makefile
+++ b/devel/bbfreeze-loader/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bbfreeze-loader
 PORTVERSION=	1.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Binary loader module required for bbfreeze
 
 LICENSE=	ZLIB
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/bbfreeze/Makefile b/devel/bbfreeze/Makefile
index 2098e4e34c78..7278391fc58b 100644
--- a/devel/bbfreeze/Makefile
+++ b/devel/bbfreeze/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bbfreeze
 PORTVERSION=	1.1.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ LICENSE=	ZLIB
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}altgraph>=0.9:math/py-altgraph@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}bbfreeze-loader>=1.1.0:devel/bbfreeze-loader
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	autoplist distutils
 
 DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index ca558a6aa6de..f65c0fbbd80a 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bzr
 PORTVERSION=	2.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 
@@ -20,7 +20,7 @@ CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root
 
 USE_PYTHON=	distutils cython
 PYDISTUTILS_PKGNAME=	bzr
-USES=		gettext python:2
+USES=		gettext python:2.7
 MAKE_ENV=	BZR_LOG=/dev/null
 
 post-install:
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index b89ed1c454b7..c59008bd9ed6 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dee
 PORTVERSION=	1.2.7
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 MASTER_SITES=	https://launchpadlibrarian.net/151383425/ \
 	https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
@@ -16,7 +16,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	vapigen:lang/vala
 LIB_DEPENDS=	libicutu.so:devel/icu
 
-USES=		gmake libtool pkgconfig pathfix python:2
+USES=		gmake libtool pkgconfig pathfix python:2.7
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 introspection:build pygobject3
 USE_LDCONFIG=	yes
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 04ef300e9dc7..457f2a1987ad 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	diffuse
 PORTVERSION=	0.4.8
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 
@@ -14,7 +15,7 @@ LICENSE_COMB=	dual
 
 CONFLICTS_INSTALL=	tinker-[0-9]*
 
-USES=		desktop-file-utils python:2 tar:bzip2
+USES=		desktop-file-utils python:2.7 tar:bzip2
 USE_GNOME=	pygtk2
 
 NO_BUILD=	yes
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index 0c282e4e50ce..04599912b192 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dissy
 PORTVERSION=	10
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 
 MAINTAINER=	sbz@FreeBSD.org
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>0:x11-toolkits/py-gtk2@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webkitgtk>0:www/py-webkitgtk@${FLAVOR}
 LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	SimonKagstrom
diff --git a/devel/distorm/Makefile b/devel/distorm/Makefile
index 428b4bb3ee23..8c0e77d8cd58 100644
--- a/devel/distorm/Makefile
+++ b/devel/distorm/Makefile
@@ -25,7 +25,7 @@ LICENSE=	GPLv3
 USES=		dos2unix tar:xz
 
 .if defined(PYTHON_SLAVEPORT)
-USES+=		python:2
+USES+=		python:2.7
 USE_PYTHON=	distutils
 
 PYDISTUTILS_PKGNAME=	distorm3
diff --git a/devel/dreampie/Makefile b/devel/dreampie/Makefile
index 688ba1398499..1b58eb6d334f 100644
--- a/devel/dreampie/Makefile
+++ b/devel/dreampie/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dreampie
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 
@@ -12,7 +13,7 @@ COMMENT=	Python shell which is designed to be reliable and fun
 LICENSE=	GPLv3
 
 USE_GNOME=	pygtk2 pygtksourceview
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 pre-patch:
diff --git a/devel/efl/Makefile b/devel/efl/Makefile
index b3a14dbf27d7..6387652d6fcf 100644
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	efl
 PORTVERSION=	1.19.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 DIST_SUBDIR=	enlightenment
@@ -24,7 +24,7 @@ LIB_DEPENDS=	libgif.so:graphics/giflib \
 
 GNU_CONFIGURE=	yes
 USES=		autoreconf compiler:c++14-lang gettext-tools gmake iconv jpeg \
-		libtool pathfix pkgconfig python:2,run shared-mime-info \
+		libtool pathfix pkgconfig python:2.7,run shared-mime-info \
 		shebangfix tar:xz
 SHEBANG_FILES=	src/scripts/eina/eina-bench-cmp
 USE_XORG=	x11 xcursor xcomposite xdamage xext xfixes xi xinerama xp \
diff --git a/devel/evemu/Makefile b/devel/evemu/Makefile
index 8d4a1e443443..1b87a4d659ca 100644
--- a/devel/evemu/Makefile
+++ b/devel/evemu/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	evemu
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 
@@ -25,8 +26,8 @@ MANPAGES_BUILD_DEPENDS=		minixmlto:textproc/minixmlto \
 MANPAGES_CONFIGURE_ENV=		XMLTO=${LOCALBASE}/bin/minixmlto
 MANPAGES_CONFIGURE_ENV_OFF=	ac_cv_path_XMLTO="" \
 				ac_cv_path_ASCIIDOC=""
-PYTHON_USES=			python:2
-PYTHON_USES_OFF=		python:2,build
+PYTHON_USES=			python:2.7
+PYTHON_USES_OFF=		python:2.7,build
 PYTHON_CONFIGURE_ENABLE=	python-bindings
 
 GNU_CONFIGURE=  yes
diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 104520c4e1f5..e041398cc0c5 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	glade3
 PORTVERSION=	3.8.5
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -38,7 +39,7 @@ GNOME_CONFIGURE_ENABLE=	gnome
 GNOME_USE=	GNOME=libgnomeui
 PYTHON_CONFIGURE_ENABLE=	python
 PYTHON_USE=	GNOME=pygtk2
-PYTHON_USES=	python:2
+PYTHON_USES=	python:2.7
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/glade3/bindings
diff --git a/devel/gobject-introspection/Makefile b/devel/gobject-introspection/Makefile
index d06a0d279dad..70404cdf6bc8 100644
--- a/devel/gobject-introspection/Makefile
+++ b/devel/gobject-introspection/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gobject-introspection
 PORTVERSION=	1.50.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
@@ -21,7 +22,7 @@ LIB_DEPENDS=	libffi.so:devel/libffi
 PORTSCOUT=	limitw:1,even
 
 USES=		bison gettext gmake gnome libtool localbase pathfix \
-		pkgconfig python:2 tar:xz
+		pkgconfig python:2.7 tar:xz
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
diff --git a/devel/hgview/Makefile b/devel/hgview/Makefile
index 4b359dc9954e..0d8e59daae1a 100644
--- a/devel/hgview/Makefile
+++ b/devel/hgview/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hgview
 PORTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP \
 		http://download.logilab.org/pub/${PORTNAME}/
@@ -21,7 +22,7 @@ BUILD_DEPENDS=	hg:devel/mercurial \
 		asciidoc:textproc/asciidoc
 
 NO_ARCH=	yes
-USES=		gmake pyqt:4 python:2
+USES=		gmake pyqt:4 python:2.7
 USE_PYQT=	gui_run qscintilla2_run
 USE_PYTHON=	distutils
 PORTDOCS=	*
diff --git a/devel/libftdi1/Makefile b/devel/libftdi1/Makefile
index 8088fc868818..066ee31939cd 100644
--- a/devel/libftdi1/Makefile
+++ b/devel/libftdi1/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libftdi1
 PORTVERSION=	1.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	http://www.intra2net.com/en/developer/libftdi/download/
 
@@ -43,7 +43,7 @@ CMAKE_ARGS+=	-DEXAMPLES:BOOL=false
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
-USES+=		python:2
+USES+=		python:2.7
 CMAKE_ARGS+=	-DPYTHON_BINDINGS:BOOL=true \
 		-DDOCUMENTATION:BOOL=false
 BUILD_DEPENDS+=	swig3.0:devel/swig30
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index 888b27bd27df..51a9d521f275 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	2.6.4
-PORTREVISION?=	8
+PORTREVISION?=	9
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME:S/2$//}/${PORTVERSION:C/..$//}
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
@@ -38,7 +38,7 @@ OPTIONS_DEFAULT=PYTHON
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USES+=		python:2
+USES+=		python:2.7
 PLIST_SUB+=	PYTHON=""
 .else
 PLIST_SUB+=	PYTHON="@comment "
diff --git a/devel/libmpsse/Makefile b/devel/libmpsse/Makefile
index f95b56d48042..0eb20022d2b9 100644
--- a/devel/libmpsse/Makefile
+++ b/devel/libmpsse/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libmpsse
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	ports@FreeBSD.org
@@ -18,7 +18,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	devttys0
 GH_TAGNAME=	f1a6744b220d
 
-USES=		autoreconf localbase:ldflags pkgconfig python:2
+USES=		autoreconf localbase:ldflags pkgconfig python:2.7
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SWIG="swig3.0"
 USE_LDCONFIG=	yes
diff --git a/devel/libmpsse/files/patch-configure.ac b/devel/libmpsse/files/patch-configure.ac
index 48a476caa92d..c7bdeb67aed0 100644
--- a/devel/libmpsse/files/patch-configure.ac
+++ b/devel/libmpsse/files/patch-configure.ac
@@ -6,7 +6,7 @@
  
 +	if ! test $PYEXE
 +  	then
-+    		PYEXE=$(which python2)
++    		PYEXE=$(which python2.7)
 +    		if ! test ${PYEXE}
 +    		then
 +      			PYEXE=$(which python)
@@ -16,7 +16,7 @@
 +
 +  	if ! test $PYDEV
 +  	then
-+    		for INCL in $(python2-config --includes)
++    		for INCL in $(python2.7-config --includes)
 +    		do
 +      			echo $INCL
 +      			INCL=$(echo "${INCL}" | sed 's:^-I::g')
diff --git a/devel/libosmocore/Makefile b/devel/libosmocore/Makefile
index 1721f981c95f..d1cd8179533b 100644
--- a/devel/libosmocore/Makefile
+++ b/devel/libosmocore/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libosmocore
 PORTVERSION=	0.10.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://git.osmocom.org/libosmocore/snapshot/ \
 		http://chaosophia.net/downloads/osmocom/${PORTNAME}/
@@ -15,12 +16,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite \
 		libtalloc.so:devel/talloc
 
-USES=		alias autoreconf gmake libtool pathfix pkgconfig python:2
+USES=		alias autoreconf gmake libtool pathfix pkgconfig python:2.7 shebangfix
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lexecinfo
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 PORTDOCS=	*
+SHEBANG_FILES=	utils/conv_codes_gsm.py utils/conv_gen.py
+python_OLD_CMD=	/usr/bin/python2
 
 OPTIONS_DEFINE=	DOXYGEN
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
@@ -31,5 +34,9 @@ post-patch:
 	${ECHO_CMD} ${PORTVERSION} > ${WRKSRC}/.tarball-version
 	@${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' \
 		${WRKSRC}/src/application.c
+	${REINPLACE_CMD} -e 's/python2/${PYTHON_VERSION}/' \
+		${WRKSRC}/include/Makefile.am \
+		${WRKSRC}/src/gsm/Makefile.am \
+		${WRKSRC}/tests/Makefile.am
 
 .include <bsd.port.mk>
diff --git a/devel/libvirt-glib/Makefile b/devel/libvirt-glib/Makefile
index 969cbe196e37..e6dadc211134 100644
--- a/devel/libvirt-glib/Makefile
+++ b/devel/libvirt-glib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libvirt-glib
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://libvirt.org/libvirt/glib/
 
@@ -21,7 +22,7 @@ VALA_BUILD_DEPENDS=	valac:lang/vala
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-introspection
-USES=		gettext gmake libtool pathfix pkgconfig python:2
+USES=		gettext gmake libtool pathfix pkgconfig python:2.7
 USE_LDCONFIG=	yes
 USE_GNOME=	intlhack introspection libxml2
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/devel/ninja-ide/Makefile b/devel/ninja-ide/Makefile
index 547c019882d5..8c8b6e136360 100644
--- a/devel/ninja-ide/Makefile
+++ b/devel/ninja-ide/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	ninja-ide
 PORTVERSION=	2.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://nivit.altervista.org/FreeBSD/ports/distfiles/
 
@@ -13,7 +13,7 @@ COMMENT=	Cross-platform integrated development environment (IDE)
 
 LICENSE=	GPLv3
 
-USES=		pyqt:4 python:2
+USES=		pyqt:4 python:2.7
 USE_PYQT=	declarative_run network  webkit
 USE_PYTHON=	distutils autoplist
 
diff --git a/devel/py-Products.LDAPMultiPlugins/Makefile b/devel/py-Products.LDAPMultiPlugins/Makefile
index fd1a2e7c8ea4..9c4d71ec1a68 100644
--- a/devel/py-Products.LDAPMultiPlugins/Makefile
+++ b/devel/py-Products.LDAPMultiPlugins/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Products.LDAPMultiPlugins
 PORTVERSION=	1.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.0.6:net/py-ldap@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Products.LDAPUserFolder>=2.9:devel/py-Products.LDAPUserFolder@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Products.PluggableAuthService>=1.4.0:security/py-Products.PluggableAuthService@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-Products.Marshall/Makefile b/devel/py-Products.Marshall/Makefile
index cf941ee6c483..8718718c789b 100644
--- a/devel/py-Products.Marshall/Makefile
+++ b/devel/py-Products.Marshall/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	Products.Marshall
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,7 +24,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR
 		${PYTHON_PKGNAMEPREFIX}DateTime>=0:devel/py-DateTime@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ExtensionClass>=0:devel/py-ExtensionClass@${FLAVOR}
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-cliapp/Makefile b/devel/py-cliapp/Makefile
index 3f7328db58eb..0758fa38d7f0 100644
--- a/devel/py-cliapp/Makefile
+++ b/devel/py-cliapp/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cliapp
 PORTVERSION=	1.20160724
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cliapp/snapshot/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ LICENSE_FILES=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 NO_ARCH=	yes
 
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-cmdtest/Makefile b/devel/py-cmdtest/Makefile
index ddf79567c284..b97fda49cac1 100644
--- a/devel/py-cmdtest/Makefile
+++ b/devel/py-cmdtest/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cmdtest
 PORTVERSION=	0.29
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://git.liw.fi/cgi-bin/cgit/cgit.cgi/cmdtest/snapshot/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}markdown>0:textproc/py-markdown@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cliapp>0:devel/py-cliapp@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ttystatus>0:devel/py-ttystatus@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/devel/py-distorm/Makefile b/devel/py-distorm/Makefile
index b9734da85619..d30bbb9f30d8 100644
--- a/devel/py-distorm/Makefile
+++ b/devel/py-distorm/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	distorm
 
 COMMENT=	Python interface for fast x86 and x86-64 disassembler library
 
-PORTREVISION=		0
+PORTREVISION=		1
 PYTHON_SLAVEPORT=	yes
 MASTERDIR=		${.CURDIR}/../distorm
 
diff --git a/devel/py-five.customerize/Makefile b/devel/py-five.customerize/Makefile
index caa5ee283fe3..70b3f35ad3f8 100644
--- a/devel/py-five.customerize/Makefile
+++ b/devel/py-five.customerize/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	five.customerize
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -30,6 +30,6 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}plone.portlets>=0:www/py-plone.portlets@${FL
 		${PYTHON_PKGNAMEPREFIX}Acquisition>=0:devel/py-Acquisition@${FLAVOR}
 
 USE_PYTHON=	distutils autoplist
-USES=		python:2 zope zip
+USES=		python:2.7 zope zip
 
 .include <bsd.port.mk>
diff --git a/devel/py-freebsd/Makefile b/devel/py-freebsd/Makefile
index e1898f94a9a2..6b30963e1009 100644
--- a/devel/py-freebsd/Makefile
+++ b/devel/py-freebsd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freebsd
 PORTVERSION=	0.9.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel python
 MASTER_SITES=	LOCAL/perky \
 		http://people.freebsd.org/~perky/distfiles/
@@ -16,7 +16,7 @@ COMMENT=	Python interface to FreeBSD-specific system libraries
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.pre.mk>
diff --git a/devel/py-functools32/Makefile b/devel/py-functools32/Makefile
index afe7901c9962..fedcab427793 100644
--- a/devel/py-functools32/Makefile
+++ b/devel/py-functools32/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	functools32
 PORTVERSION=	3.2.3
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -15,7 +16,7 @@ GH_ACCOUNT=	MiCHiLU
 GH_PROJECT=	python-functools32
 GH_TAGNAME=	ad90fa8
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-gdata/Makefile b/devel/py-gdata/Makefile
index 6da11846a720..7190cafd18d6 100644
--- a/devel/py-gdata/Makefile
+++ b/devel/py-gdata/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gdata
 PORTVERSION=	2.0.18
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	GData Python Client Library
 
 LICENSE=	APACHE20
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_DEFINE=	GMPY M2CRYPTO PYCRYPTO EXAMPLES
diff --git a/devel/py-gobject/Makefile b/devel/py-gobject/Makefile
index 087c1c4e6188..5a1face7b12c 100644
--- a/devel/py-gobject/Makefile
+++ b/devel/py-gobject/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gobject
 PORTVERSION=	2.28.6
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel python
 MASTER_SITES=	GNOME/sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo@${PY_FL
 
 PORTSCOUT=	ignore:1
 
-USES=		gmake libtool pathfix pkgconfig python:2 tar:xz shebangfix
+USES=		gmake libtool pathfix pkgconfig python:2.7 tar:xz shebangfix
 USE_GNOME=	glib20 introspection:build,run
 USE_PYTHON=	flavors
 GNU_CONFIGURE=	yes
diff --git a/devel/py-google-apputils/Makefile b/devel/py-google-apputils/Makefile
index a6c7cd34df11..66f9e5c92e08 100644
--- a/devel/py-google-apputils/Makefile
+++ b/devel/py-google-apputils/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	google-apputils
 PORTVERSION=	0.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-gflags>2:devel/py-python-gflags@${FLA
 		${PYTHON_PKGNAMEPREFIX}dateutil>2:devel/py-dateutil@${FLAVOR}
 
 NO_ARCH=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-grouch/Makefile b/devel/py-grouch/Makefile
index 78cb6551bb7b..2c5adabdaa65 100644
--- a/devel/py-grouch/Makefile
+++ b/devel/py-grouch/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	grouch
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	https://www.mems-exchange.org/software/files/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	System for describing and enforcing a Python object schema
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	*
diff --git a/devel/py-hghooks/Makefile b/devel/py-hghooks/Makefile
index 9b6f116c306c..7c793d2c3ddf 100644
--- a/devel/py-hghooks/Makefile
+++ b/devel/py-hghooks/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hghooks
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Set of Mercurial hooks
 
 LICENSE=	LGPL3
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-hgsubversion/Makefile b/devel/py-hgsubversion/Makefile
index 9875e311b014..3b4a19ee09c5 100644
--- a/devel/py-hgsubversion/Makefile
+++ b/devel/py-hgsubversion/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hgsubversion
 PORTVERSION=	1.8.6
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ OPTIONS_DEFINE=	SUBVERTPY
 OPTIONS_DEFAULT=SUBVERTPY
 SUBVERTPY_DESC=	Use subvertpy python bindings
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.options.mk>
diff --git a/devel/py-instant/Makefile b/devel/py-instant/Makefile
index 8bfc44c3e1d7..d7d22d3ac00c 100644
--- a/devel/py-instant/Makefile
+++ b/devel/py-instant/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	instant
 PORTVERSION=	${MMVERSION}.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/${MMVERSION}.x/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ LICENSE=	LGPL3
 
 RUN_DEPENDS=	swig3.0:devel/swig30
 
-USES=			python:2
+USES=			python:2.7
 USE_PYTHON=		distutils
 PYDISTUTILS_PKGNAME=	instant
 
diff --git a/devel/py-ioflo/Makefile b/devel/py-ioflo/Makefile
index 39437a5395f4..77a2a158ad18 100644
--- a/devel/py-ioflo/Makefile
+++ b/devel/py-ioflo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ioflo
 PORTVERSION=	1.5.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Automated Reasoning Engine and Flow Based Programming Framework
 
 LICENSE=	APACHE20
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/devel/py-jsonrpclib/Makefile b/devel/py-jsonrpclib/Makefile
index 7667ed9c714a..03dc15b9d150 100644
--- a/devel/py-jsonrpclib/Makefile
+++ b/devel/py-jsonrpclib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jsonrpclib
 PORTVERSION=	0.1.7
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Implements the JSON-RPC 2.0 proposed specification in pure Python
 
 LICENSE=	APACHE20
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	CJSON
diff --git a/devel/py-kayako/Makefile b/devel/py-kayako/Makefile
index 8dde23186cae..56df31509766 100644
--- a/devel/py-kayako/Makefile
+++ b/devel/py-kayako/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kayako
 PORTVERSION=	1.1.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Python API Wrapper for Kayako
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR}
 
 NO_ARCH=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/py-krosspython/Makefile b/devel/py-krosspython/Makefile
index 98318bc208b1..0126d17c6d57 100644
--- a/devel/py-krosspython/Makefile
+++ b/devel/py-krosspython/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	krosspython
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel kde kde-kde4 python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	kross-interpreters-${PORTVERSION}
@@ -10,7 +10,7 @@ DISTNAME=	kross-interpreters-${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Kross Python scripting library
 
-USES=		cmake:outsource kde:4 python:2 tar:xz
+USES=		cmake:outsource kde:4 python:2.7 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_QT4=	corelib gui qmake_build moc_build uic_build rcc_build
 CMAKE_ARGS+=	-DBUILD_falcon:BOOL=FALSE \
diff --git a/devel/py-liblarch/Makefile b/devel/py-liblarch/Makefile
index 2e4b6f1bd424..d22e5c676cdd 100644
--- a/devel/py-liblarch/Makefile
+++ b/devel/py-liblarch/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	liblarch
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ LICENSE=	LGPL3
 
 USE_GITHUB=	yes
 USE_GNOME=	pygobject
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-meliae/Makefile b/devel/py-meliae/Makefile
index d3fdf5cd2dd3..c0067b533ed1 100644
--- a/devel/py-meliae/Makefile
+++ b/devel/py-meliae/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	meliae
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	http://launchpadlibrarian.net/74803944/ \
 		LOCAL/sbz
@@ -13,7 +13,7 @@ COMMENT=	Python Memory Usage Analyzer
 
 LICENSE=	GPLv3
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist cython
 
 regression-test: extract
diff --git a/devel/py-mongokit/Makefile b/devel/py-mongokit/Makefile
index 7937d73b2e3c..44c60f56aede 100644
--- a/devel/py-mongokit/Makefile
+++ b/devel/py-mongokit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mongokit
 PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Python ORM-like layer on top of pymongo
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pymongo>=2.0.1:databases/pymongo@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile
index 85b415970807..e567c52f2c27 100644
--- a/devel/py-notify/Makefile
+++ b/devel/py-notify/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	notify
 PORTVERSION=	0.1.1
 DISTVERSIONPREFIX=python-
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.galago-project.org/files/releases/source/notify-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ OPTIONS_DEFINE=	DOCS
 
 LIB_DEPENDS=	libnotify.so:devel/libnotify
 
-USES=		gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig python:2.7 tar:bzip2
 USE_GNOME=	pygtk2
 USE_PYTHON=	flavors
 INSTALL_TARGET=	install-strip
diff --git a/devel/py-ordereddict/Makefile b/devel/py-ordereddict/Makefile
index fbce874c9062..5c7e76d352e1 100644
--- a/devel/py-ordereddict/Makefile
+++ b/devel/py-ordereddict/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ordereddict
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	Drop-in substitute for Py2.7's new collections
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:2		# for graphics/py-blocking
+USES=		python:2.7		# for graphics/py-blocking
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-palm/Makefile b/devel/py-palm/Makefile
index 867b2ed13da4..7cbc3dda811b 100644
--- a/devel/py-palm/Makefile
+++ b/devel/py-palm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	palm
 PORTVERSION=	0.1.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	BSD2CLAUSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simpleparse>0:devel/py-simpleparse@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 post-patch:
diff --git a/devel/py-pp/Makefile b/devel/py-pp/Makefile
index c57dcc09d640..845aeb3a9ab4 100644
--- a/devel/py-pp/Makefile
+++ b/devel/py-pp/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pp
 PORTVERSION=	1.6.6
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.parallelpython.com/downloads/pp/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Parallel python execution server
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-pybind11/Makefile b/devel/py-pybind11/Makefile
index 3902b8ceb1c5..26c7f7ce2235 100644
--- a/devel/py-pybind11/Makefile
+++ b/devel/py-pybind11/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pybind11
 DISTVERSION=	2.2.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Seamless interoperability between C++11 and Python
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/devel/py-pydoop/Makefile b/devel/py-pydoop/Makefile
index 8b9a5b022bd7..dbb99b3c6269 100644
--- a/devel/py-pydoop/Makefile
+++ b/devel/py-pydoop/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pydoop
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Python interface to Hadoop
 BUILD_DEPENDS=	${LOCALBASE}/bin/yarn:devel/hadoop2
 RUN_DEPENDS=	${LOCALBASE}/bin/yarn:devel/hadoop2
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 USE_JAVA=	1.7
 MAKE_ENV+=	HADOOP_HOME=${LOCALBASE} \
diff --git a/devel/py-pykde4/Makefile b/devel/py-pykde4/Makefile
index 3aebf861ced1..37103cf95f34 100644
--- a/devel/py-pykde4/Makefile
+++ b/devel/py-pykde4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pykde4
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel kde kde-kde4 python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -11,7 +11,7 @@ COMMENT=	Python bindings for KDE
 
 LIB_DEPENDS=	libqwt.so:x11-toolkits/qwt5
 
-USES=		cmake:outsource kde:4 python:2 pyqt:4 tar:xz
+USES=		cmake:outsource kde:4 python:2.7 pyqt:4 tar:xz
 USE_KDE=	kdelibs nepomuk-core okular pimlibs \
 		akonadi automoc4 soprano
 USE_PYQT=	declarative designer gui network opengl phonon script sip \
diff --git a/devel/py-pykdeuic4/Makefile b/devel/py-pykdeuic4/Makefile
index 00237be0dd7d..8b95c96a4bd7 100644
--- a/devel/py-pykdeuic4/Makefile
+++ b/devel/py-pykdeuic4/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pykdeuic4
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel kde kde-kde4 python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pykde4-${PORTVERSION}
@@ -10,7 +10,7 @@ DISTNAME=	pykde4-${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Enhanced version of pyuic4
 
-USES=		cmake:outsource python:2 kde:4 shebangfix tar:xz
+USES=		cmake:outsource python:2.7 kde:4 shebangfix tar:xz
 USE_KDE=	kdelibs automoc4 pykde4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 DISTINFO_FILE=	${.CURDIR:H:H}/devel/py-pykde4/distinfo
diff --git a/devel/py-pytemplate/Makefile b/devel/py-pytemplate/Makefile
index f056f5c298ad..6eb9f0e5664b 100644
--- a/devel/py-pytemplate/Makefile
+++ b/devel/py-pytemplate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pytemplate
 PORTVERSION=	1.5.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 MASTER_SITES=	http://www.bulot.org/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Pytemplate gives python developers a starting framework
 
 LICENSE=	GPLv3
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-pytemplate
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index 08cf82c4cc4d..c21feb435396 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyutil
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.1:devel/py-simplejson@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zbase32>=1.1.0:converters/zbase32
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-extract:
diff --git a/devel/py-rlcompleter2/Makefile b/devel/py-rlcompleter2/Makefile
index 2980f38b7787..28a4e0f2d8bb 100644
--- a/devel/py-rlcompleter2/Makefile
+++ b/devel/py-rlcompleter2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rlcompleter2
 PORTVERSION=	0.98
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Python module for readline interactive completion
 
 LICENSE=	MIT
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-robotframework-selenium2library/Makefile b/devel/py-robotframework-selenium2library/Makefile
index 37ee59b4a791..d624700aec33 100644
--- a/devel/py-robotframework-selenium2library/Makefile
+++ b/devel/py-robotframework-selenium2library/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	robotframework-selenium2library
 PORTVERSION=	1.8.0
+PORTREVISION=	1
 CATEGORIES=	devel www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}robotframework>=2.7.5:devel/py-robotframework@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>=3.4.0:devel/py-decorator@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/devel/py-spark/Makefile b/devel/py-spark/Makefile
index 8d3f41a81a4c..d6e5e52fa88a 100644
--- a/devel/py-spark/Makefile
+++ b/devel/py-spark/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spark
 PORTVERSION=	0.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	http://pages.cpsc.ucalgary.ca/~aycock/spark/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scanning, Parsing, and Rewriting Kit
 
-USES=		python:2
+USES=		python:2.7
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/devel/py-trace2html/Makefile b/devel/py-trace2html/Makefile
index 21cc35fc068c..7da3da00387d 100644
--- a/devel/py-trace2html/Makefile
+++ b/devel/py-trace2html/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	trace2html
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	HTML coverage report generator for trace.py
 
 LICENSE=	GPLv2
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-ttystatus/Makefile b/devel/py-ttystatus/Makefile
index e48517f8f123..7156d2ee09a0 100644
--- a/devel/py-ttystatus/Makefile
+++ b/devel/py-ttystatus/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ttystatus
 PORTVERSION=	0.32
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://git.liw.fi/cgi-bin/cgit/cgit.cgi/ttystatus/snapshot/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Python progress reporting to /dev/tty
 LICENSE=	GPLv3
 LICENSE_FILES=	${WRKSRC}/COPYING
 
-USES=		python:2
+USES=		python:2.7
 NO_ARCH=	yes
 
 USE_PYTHON=	distutils autoplist
diff --git a/devel/py-tvrage/Makefile b/devel/py-tvrage/Makefile
index 22b95f99522a..b57dca98451a 100644
--- a/devel/py-tvrage/Makefile
+++ b/devel/py-tvrage/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tvrage
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -15,7 +16,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	ckreutzer
 GH_PROJECT=	python-${PORTNAME}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	python_${PORTNAME}
 
diff --git a/devel/py-uncompyle2/Makefile b/devel/py-uncompyle2/Makefile
index a8beda094f92..ff94f451cb0e 100644
--- a/devel/py-uncompyle2/Makefile
+++ b/devel/py-uncompyle2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	uncompyle2
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	py-
 
@@ -12,7 +13,7 @@ COMMENT=	Decompiler for Python's .pyc and .pyo files
 USE_GITHUB=	yes
 GH_ACCOUNT=	Mysterie
 GH_TAGNAME=	3956a5a
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 REINPLACE_ARGS=	-i ""
 
diff --git a/devel/py-wsgitools/Makefile b/devel/py-wsgitools/Makefile
index bdbd0680e8e3..1b82d703bf18 100644
--- a/devel/py-wsgitools/Makefile
+++ b/devel/py-wsgitools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wsgitools
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://subdivi.de/~helmut/${PORTNAME}/dist/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT=	Useful middlewares and filters for wsgi as well as scgi servers
 
 LICENSE=	GPLv2+
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/py-xoltar-toolkit/Makefile b/devel/py-xoltar-toolkit/Makefile
index a24460bd6a31..8deb8173d017 100644
--- a/devel/py-xoltar-toolkit/Makefile
+++ b/devel/py-xoltar-toolkit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xoltar-toolkit
 PORTVERSION=	2001.06.01
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/xoltar%20toolkit/June%202001
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Functional programming, lazy expressions, and thread pools for Python
 
 LICENSE=	LGPL21+
 
-USES=		python:2
+USES=		python:2.7
 NO_WRKSUBDIR=	yes
 NO_ARCH=	yes
 
diff --git a/devel/py-zLOG/Makefile b/devel/py-zLOG/Makefile
index d1fd7af96a8d..45e3253e1a6b 100644
--- a/devel/py-zLOG/Makefile
+++ b/devel/py-zLOG/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	zLOG
 PORTVERSION=	2.11.2
+PORTREVISION=	1
 CATEGORIES=	devel python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zconfig>=0:devel/py-zconfig@${FLAVOR}
 
 NO_ARCH=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/devel/pydbus-common/Makefile b/devel/pydbus-common/Makefile
index 0a9e01b2ae8b..2467466e5735 100644
--- a/devel/pydbus-common/Makefile
+++ b/devel/pydbus-common/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	1.2.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	devel gnome python
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
 PKGNAMEPREFIX?=	py
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 INSTALL_TARGET=	install-strip
 
 .if ${SLAVE_PORT} == no
-USES+=		python:2,build
+USES+=		python:2.7,build
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
diff --git a/devel/pypersrc/Makefile b/devel/pypersrc/Makefile
index 8da287c8dcc0..c47d10b7538c 100644
--- a/devel/pypersrc/Makefile
+++ b/devel/pypersrc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pypersrc
 PORTVERSION=	20120106
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.jimbrooks.org/software/pypersrc/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -19,7 +19,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		gmake python:2 tar:bzip2
+USES=		gmake python:2.7 tar:bzip2
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.sh
 MAKE_ENV=	CXX_FLAGS="${CXXFLAGS}"
diff --git a/devel/pyside-tools/Makefile b/devel/pyside-tools/Makefile
index 884f4755d6d9..37807d155ba7 100644
--- a/devel/pyside-tools/Makefile
+++ b/devel/pyside-tools/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyside-tools
 PORTVERSION=	0.2.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
@@ -21,7 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	PySide
 GH_PROJECT=	Tools
 
-USES=		cmake python:2 shebangfix
+USES=		cmake python:2.7 shebangfix
 SHEBANG_FILES=	pyside-uic pysideuic/icon_cache.py
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 
diff --git a/devel/pyside/Makefile b/devel/pyside/Makefile
index 6dfccdf47fb1..f5429b9a23dc 100644
--- a/devel/pyside/Makefile
+++ b/devel/pyside/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	pyside
 PORTVERSION=	1.2.2
 DISTVERSIONPREFIX=	qt4.8+
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://download.qt-project.org/official_releases/pyside/
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
@@ -29,7 +29,7 @@ USE_QT4=	declarative designer gui help qmake_build \
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		PYTHON_VERSION=${PYTHON_VERSION}
 
-USES=		cmake python:2 tar:bzip2
+USES=		cmake python:2.7 tar:bzip2
 USE_PYTHON=	flavors
 USE_LDCONFIG=	yes
 
diff --git a/devel/pyst/Makefile b/devel/pyst/Makefile
index d8b9c5f4b7e9..4f9d20cd851f 100644
--- a/devel/pyst/Makefile
+++ b/devel/pyst/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyst
 PORTVERSION=	0.6.50
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	SF/${PORTNAME}/pyst/${PORTVERSION}
 
@@ -12,7 +13,7 @@ COMMENT=	Python interface to allow Asterisk programming
 LICENSE=	LGPL21 PSFL
 LICENSE_COMB=	dual
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 NO_ARCH=	yes
 
diff --git a/devel/pythk/Makefile b/devel/pythk/Makefile
index 2a71a6f421bc..0b83942e438d 100644
--- a/devel/pythk/Makefile
+++ b/devel/pythk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pythk
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Collection of Python functions
 
 LICENSE=	BSD2CLAUSE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/runsnakerun/Makefile b/devel/runsnakerun/Makefile
index 3223fff52db9..c24d977d5182 100644
--- a/devel/runsnakerun/Makefile
+++ b/devel/runsnakerun/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	runsnakerun
 DISTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 DISTNAME=	${PORTNAME:C/r/R/g:C/s/S/}-${DISTVERSION}
@@ -16,7 +16,7 @@ LICENSE=	BSD2CLAUSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}SquareMap>0:x11-toolkits/py-SquareMap@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}meliae>0:devel/py-meliae@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/devel/shedskin/Makefile b/devel/shedskin/Makefile
index e7bd5f6ee468..b52b529047f2 100644
--- a/devel/shedskin/Makefile
+++ b/devel/shedskin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	shedskin
 PORTVERSION=	0.9.4
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel python
 
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/libgc.so:devel/boehm-gc \
 
 USE_GITHUB=	yes
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index 1c962f74534e..891a64e0c9af 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	spark
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	devel java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
 		LOCAL/demon/:maven \
@@ -22,7 +23,7 @@ BUILD_DEPENDS=	${LOCALBASE}/share/java/maven33/bin/mvn:devel/maven33 \
 RUN_DEPENDS=	bash:shells/bash \
 		yarn:devel/hadoop2
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} MAVEN_OPTS="-Xmx2g -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=512m"
diff --git a/devel/zziplib/Makefile b/devel/zziplib/Makefile
index 58e147794108..656bb3369b4c 100644
--- a/devel/zziplib/Makefile
+++ b/devel/zziplib/Makefile
@@ -15,7 +15,7 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	zip:archivers/zip
 
-USES=		libtool pathfix pkgconfig python:2,build tar:bzip2
+USES=		libtool pathfix pkgconfig python:2.7,build tar:bzip2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_XMLTO=":"
 USE_LDCONFIG=	yes
diff --git a/dns/py-dns/Makefile b/dns/py-dns/Makefile
index 0b62a8745ee0..489c3e7af095 100644
--- a/dns/py-dns/Makefile
+++ b/dns/py-dns/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dns
 PORTVERSION=	2.3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ LICENSE_NAME=	CNRI LICENSE AGREEMENT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	README.txt README-guido.txt
diff --git a/dns/py-idnkit2/Makefile b/dns/py-idnkit2/Makefile
index 605dc9e7aee5..8f213dcf0925 100644
--- a/dns/py-idnkit2/Makefile
+++ b/dns/py-idnkit2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	idnkit-python
 PORTVERSION=	2.3
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://jprs.co.jp/idn/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Python bindings for Internationalized Domain Name toolkit 2
 
 LIB_DEPENDS=	libidnkitlite.so:dns/idnkit2
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 
 post-patch:
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index dad692451f85..c3188c7c9f1d 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	unbound
 PORTVERSION=	1.6.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	http://unbound.net/downloads/
 
@@ -75,7 +75,7 @@ PYTHON_BUILD_DEPENDS=	swig3.0:devel/swig30
 PYTHON_CONFIGURE_ON=	--with-pyunbound=yes --with-pythonmodule=yes \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			ac_cv_path_SWIG=${LOCALBASE}/bin/swig3.0
-PYTHON_USES=		python:2
+PYTHON_USES=		python:2.7
 PYTHON_VARS=		STRIP_FILES+=.libs/_unbound.so
 THREADS_CONFIGURE_WITH=	pthreads
 
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index 8e80c4357065..00699cfe0316 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	leo
 PORTVERSION=	5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	editors python
 MASTER_SITES=	SF/${PORTNAME}/Leo/${PORTVERSION}-final
 DISTNAME=	Leo-${PORTVERSION}-final
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
 		silvercity>0:textproc/silvercity
 
-USES=		pyqt:4 python:2 shebangfix zip
+USES=		pyqt:4 python:2.7 shebangfix zip
 SHEBANG_FILES=	leo/doc/html/fixup.pl leo/external/saveleo \
 		leo/dist/leo-install.py leo/scripts/leo
 USE_PYQT=	gui_run svg_run
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 88b63d76c104..17403702cb4d 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -22,7 +22,7 @@ GH_ACCOUNT=	mamedev
 GH_PROJECT=	mame				# explicit (master port)
 GH_TAGNAME=	mame${PORTVERSION:S/.//}
 
-USES=		compiler:c11 gmake jpeg pkgconfig python:2,build shebangfix
+USES=		compiler:c11 gmake jpeg pkgconfig python:2.7,build shebangfix
 SHEBANG_FILES=	src/devices/cpu/m6502/m6502make.py \
 		src/devices/cpu/m6809/m6809make.py \
 		src/devices/cpu/mcs96/mcs96make.py \
diff --git a/emulators/qemu-devel/Makefile b/emulators/qemu-devel/Makefile
index 0cc6f46b0e54..0c9a41d1b615 100644
--- a/emulators/qemu-devel/Makefile
+++ b/emulators/qemu-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT=	QEMU CPU Emulator - development version
 LICENSE=	GPLv2
 
 HAS_CONFIGURE=	yes
-USES=		cpe gmake pkgconfig bison perl5 python:2,build ssl tar:bzip2
+USES=		cpe gmake pkgconfig bison perl5 python:2.7,build ssl tar:bzip2
 USE_PERL5=	build
 USE_XORG=	pixman
 USE_GNOME+=	cairo glib20
diff --git a/emulators/qemu-ppcnv/Makefile b/emulators/qemu-ppcnv/Makefile
index da783d01c27f..346acadf73c0 100644
--- a/emulators/qemu-ppcnv/Makefile
+++ b/emulators/qemu-ppcnv/Makefile
@@ -25,7 +25,7 @@ GH_PROJECT=	qemu
 GH_TAGNAME=	8d5981c
 
 HAS_CONFIGURE=	yes
-USES=		gmake libtool makeinfo pkgconfig python:2,build
+USES=		gmake libtool makeinfo pkgconfig python:2.7,build
 USE_XORG=	pixman
 USE_GNOME+=	glib20
 ONLY_FOR_ARCHS=	amd64
diff --git a/emulators/qemu-utils/Makefile b/emulators/qemu-utils/Makefile
index 20b4ad0e6e08..630be8819de0 100644
--- a/emulators/qemu-utils/Makefile
+++ b/emulators/qemu-utils/Makefile
@@ -6,7 +6,7 @@ MAINTAINER=	asomers@FreeBSD.org
 COMMENT=	QEMU userland utilities
 
 HAS_CONFIGURE=	yes
-USES=		cpe gmake pkgconfig perl5 python:2,build tar:bzip2
+USES=		cpe gmake pkgconfig perl5 python:2.7,build tar:bzip2
 USES+=		gettext-runtime
 USE_GNOME+=	glib20
 MAKE_ENV+=	BSD_MAKE="${MAKE}" PREFIX=${PREFIX}
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index f25e9fcf5a67..2983c580a4f0 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS?=	libnettle.so:security/nettle \
 		libfreetype.so:print/freetype2
 
 HAS_CONFIGURE=	yes
-USES?=		cpe gmake pkgconfig bison perl5 python:2,build tar:bzip2
+USES?=		cpe gmake pkgconfig bison perl5 python:2.7,build tar:bzip2
 USE_PERL5=	build
 MAKE_ENV+=	BSD_MAKE="${MAKE}" V=1
 .if !defined(PKGNAMESUFFIX) || ${PKGNAMESUFFIX} != "-utils"
diff --git a/finance/bitcoin-armory/Makefile b/finance/bitcoin-armory/Makefile
index 2a4396a92862..bb2ee1f77f17 100644
--- a/finance/bitcoin-armory/Makefile
+++ b/finance/bitcoin-armory/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	BitcoinArmory
 PORTVERSION=	0.93.3
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	finance
 
 MAINTAINER=	yuri@rawbw.com
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=14.0.0:devel/py-twisted@${PY_FLAVOR
 USE_GITHUB=	yes
 GH_ACCOUNT=	etotheipi
 
-USES=		compiler:c++11-lang compiler:c++11-lib gmake pyqt:4 python:2 shebangfix
+USES=		compiler:c++11-lang compiler:c++11-lib gmake pyqt:4 python:2.7 shebangfix
 USE_PYQT=	core_run gui_run
 SHEBANG_FILES=	ArmoryQt.py extras/extractKeysFromWallet.py
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile
index f868bc5771fb..ca3eae2cce12 100644
--- a/finance/ktoblzcheck/Makefile
+++ b/finance/ktoblzcheck/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ktoblzcheck
 PORTVERSION=	1.49
+PORTREVISION=	1
 CATEGORIES=	finance german
 MASTER_SITES=	SF/${PORTNAME}
 
@@ -24,7 +25,7 @@ PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS PYTHON
 OPTIONS_SUB=	yes
 
-PYTHON_USES=			python:2
+PYTHON_USES=			python:2.7
 PYTHON_CONFIGURE_ENABLE=	python
 
 TEST_TARGET=			check
diff --git a/finance/tryton28/Makefile b/finance/tryton28/Makefile
index b20293f9e049..fde0c1ce15e5 100644
--- a/finance/tryton28/Makefile
+++ b/finance/tryton28/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tryton
 PORTVERSION=	2.8.12
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	CHEESESHOP \
 		http://downloads.tryton.org/2.8/
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>=1.5:devel/py-dateutil@${FLAVOR} \
 
 CONFLICTS=	tryton-2.[46].*
 
-USES=		desktop-file-utils gettext python:2
+USES=		desktop-file-utils gettext python:2.7
 USE_PYTHON=	distutils autoplist
 USE_GNOME=	gtk20 pygtk2
 
diff --git a/games/anki/Makefile b/games/anki/Makefile
index f9744db50314..8e9228f91d93 100644
--- a/games/anki/Makefile
+++ b/games/anki/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	anki
 PORTVERSION=	2.0.36
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games python
 MASTER_SITES=	http://ankisrs.net/download/mirror/
 DIST_SUBDIR=	python
@@ -23,7 +23,7 @@ RUN_DEPENDS=	lame:audio/lame \
 		${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}send2trash>0:deskutils/py-send2trash@${PY_FLAVOR}
 
-USES=		desktop-file-utils pyqt:4 python:2 shared-mime-info shebangfix tar:tgz
+USES=		desktop-file-utils pyqt:4 python:2.7 shared-mime-info shebangfix tar:tgz
 SHEBANG_FILES=	tools/build_ui.sh tools/tests.sh
 USE_PYQT=	network_run webkit_run
 USE_QT4=	network_run webkit_run
diff --git a/games/barbie_seahorse_adventures/Makefile b/games/barbie_seahorse_adventures/Makefile
index 26452a88bcc5..f7fd8c3fde7c 100644
--- a/games/barbie_seahorse_adventures/Makefile
+++ b/games/barbie_seahorse_adventures/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	barbie_seahorse_adventures
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games python
 MASTER_SITES=	http://www.imitationpickles.org/barbie/files/
 DISTNAME=	barbie-${DISTVERSION}
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/barbie-${DISTVERSION}
 
-USES=		dos2unix python:2 shebangfix tar:tgz
+USES=		dos2unix python:2.7 shebangfix tar:tgz
 SHEBANG_FILES=	run_game.py create-upload.py
 DOS2UNIX_GLOB=	*.py
 NO_BUILD=	yes
diff --git a/games/bouncy/Makefile b/games/bouncy/Makefile
index 0cb0e58247d2..d975d8b8a6ae 100644
--- a/games/bouncy/Makefile
+++ b/games/bouncy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bouncy
 PORTVERSION=	r6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games python
 MASTER_SITES=	http://media.pyweek.org/dl/3/bouncy/ \
 		SF/nemysisfreebsdp/games/${PORTNAME}/:icons
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYGAME} \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-post-${DISTVERSION}
 
-USES=		python:2
+USES=		python:2.7
 
 PORTDOCS=	README.txt
 
diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile
index f3d99d9fb2d5..bab1a80c3d77 100644
--- a/games/childsplay/Makefile
+++ b/games/childsplay/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	childsplay
 PORTVERSION=	2.6.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SAVANNAH
 
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlalchemy10>0:databases/py-sqlalchemy10@${P
 
 NO_BUILD=	yes
 
-USES=		gettext shebangfix tar:tgz python:2
+USES=		gettext shebangfix tar:tgz python:2.7
 USE_GNOME=	pygtk2
 
 SHEBANG_FILES=	childsplay.py
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 8f1a7cc9b167..05b844777a92 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gcompris
 PORTVERSION=	15.10
+PORTREVISION=	1
 CATEGORIES=	games gnome
 MASTER_SITES=	http://gcompris.net/download/
 
@@ -22,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 		gnucap:cad/gnucap
 
 USES=		display:configure gettext gmake libtool localbase pathfix \
-		pkgconfig python:2 shebangfix sqlite tar:bzip2
+		pkgconfig python:2.7 shebangfix sqlite tar:bzip2
 SHEBANG_FILES=	boards/voices/*.sh
 GNU_CONFIGURE=	yes
 USE_GSTREAMER=	yes
diff --git a/games/mudmagic/Makefile b/games/mudmagic/Makefile
index 07856996a996..34c9ce578a3b 100644
--- a/games/mudmagic/Makefile
+++ b/games/mudmagic/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mudmagic
 PORTVERSION=	1.9
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	games
 MASTER_SITES=	http://www.mudmagic.com/mud-client/downloads/
 
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		gettext-runtime gmake libtool localbase pathfix \
-		pkgconfig python sqlite
+		pkgconfig python:2.7 sqlite
 USE_GNOME=	cairo gdkpixbuf2 gtk20 libglade2 libxml2
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/games/mudmagic/files/patch-configure b/games/mudmagic/files/patch-configure
new file mode 100644
index 000000000000..57b091871836
--- /dev/null
+++ b/games/mudmagic/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2018-02-11 22:32:42 UTC
++++ configure
+@@ -18702,7 +18702,7 @@ FOUND_PYTHON=no
+ PYTHON_CXXFLAGS=""
+ PYTHON_LIBS=""
+ 
+-PYTHON_binchk="python python2 python2.2 python2.3 python2.4"
++PYTHON_binchk="python python2 python2.2 python2.3 python2.4 python2.7"
+ for i in ${PYTHON_binchk};
+ do
+     PYTHON_check=`$i -V 2>/dev/null; echo $?`
diff --git a/games/nelly/Makefile b/games/nelly/Makefile
index 2c8e3e5dcf2c..6f7a479b75ca 100644
--- a/games/nelly/Makefile
+++ b/games/nelly/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nelly
 PORTVERSION=	1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games python
 MASTER_SITES=	http://www.partiallydisassembled.net/nelly/ \
 		http://media.pyweek.org/dl/2/rushed/ \
@@ -19,7 +19,7 @@ COMMENT=	Nelly's Rooftop Garden, physics-based puzzle game
 RUN_DEPENDS=	${PYGAME} \
 		${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 
 PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
diff --git a/games/oneisenough/Makefile b/games/oneisenough/Makefile
index 8099863f6d03..3d1940d09c35 100644
--- a/games/oneisenough/Makefile
+++ b/games/oneisenough/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	oneisenough
 PORTVERSION=	0.40
+PORTREVISION=	1
 CATEGORIES=	games python
 MASTER_SITES=	http://hectigo.net/games/oneisenough/ \
 		SF/nemysisfreebsdp/games/:icons
@@ -20,7 +21,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/"one is enough"
 
-USES=		dos2unix python:2 shebangfix zip
+USES=		dos2unix python:2.7 shebangfix zip
 DOS2UNIX_FILES=	*.txt bin/*.py
 DOS2UNIX_REGEX= .*.[^pt][^nt][^gf]
 SHEBANG_FILES=	run_game.py bin/mainmenu.py
diff --git a/games/poker-engine/Makefile b/games/poker-engine/Makefile
index 881b035708d3..b2a54a7d269b 100644
--- a/games/poker-engine/Makefile
+++ b/games/poker-engine/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	poker-engine
 PORTVERSION=	1.3.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://download.gna.org/pokersource/sources/
 
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rsync:net/rsync \
 		${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${FLAVOR} \
 		${PYTHON_SITELIBDIR}/libxslt.py:textproc/py-libxslt@${FLAVOR}
 
-USES=		gettext gmake pathfix pkgconfig python:2
+USES=		gettext gmake pathfix pkgconfig python:2.7
 USE_PYTHON=	flavors
 GNU_CONFIGURE=	yes
 
diff --git a/games/py-fife/Makefile b/games/py-fife/Makefile
index ac6ebd2071d0..00ff2f0cfb76 100644
--- a/games/py-fife/Makefile
+++ b/games/py-fife/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		fife
 PORTVERSION=		0.4.1
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		games
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
 
@@ -60,7 +60,7 @@ ZIP_CMAKE_BOOL=		zip
 LOGGING_CMAKE_BOOL=	logging
 
 PYTHON_CMAKE_BOOL=	build-python
-PYTHON_USES=		python:2
+PYTHON_USES=		python:2.7
 PYTHON_USE=		python=flavors
 PYTHON_BUILD_DEPENDS=	${LOCALBASE}/bin/swig3.0:devel/swig30
 
diff --git a/games/py-poker-eval/Makefile b/games/py-poker-eval/Makefile
index 3349255277b0..59925b27cac3 100644
--- a/games/py-poker-eval/Makefile
+++ b/games/py-poker-eval/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	poker-eval
 PORTVERSION=	0.138
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games python
 MASTER_SITES=	http://download.gna.org/pokersource/sources/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpoker-eval.so:games/poker-eval
 
-USES=		autoreconf libtool pathfix pkgconfig python:2
+USES=		autoreconf libtool pathfix pkgconfig python:2.7
 USE_PYTHON=	flavors
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	PYTHON=""
diff --git a/games/pycadia/Makefile b/games/pycadia/Makefile
index 078553c8ed3f..f9263cdecd5e 100644
--- a/games/pycadia/Makefile
+++ b/games/pycadia/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pycadia
 PORTVERSION=	0.5.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games python
 MASTER_SITES=	GENTOO \
 		SF/nemysisfreebsdp/games/
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_GNOME=	pygtk2 libgnomeui
 SHEBANG_FILES=	*.py
 NO_ARCH=	yes
diff --git a/games/pyfa/Makefile b/games/pyfa/Makefile
index 8870dcfd6137..eb14ebfbf7ed 100644
--- a/games/pyfa/Makefile
+++ b/games/pyfa/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyfa
 PORTVERSION=	1.19.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games python
 
@@ -21,7 +21,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	pyfa-org
 GH_PROJECT=	Pyfa
 
-USES=		python:2 dos2unix
+USES=		python:2.7 dos2unix
 DOS2UNIX_GLOB=	*.py
 NO_ARCH=	yes
 
diff --git a/games/pythonchess/Makefile b/games/pythonchess/Makefile
index df959432b04a..c81201f7113e 100644
--- a/games/pythonchess/Makefile
+++ b/games/pythonchess/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pythonchess
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://sites.google.com/site/purplesaguaroinc/myfiles/ \
 		SF/nemysisfreebsdp/games/:icons
@@ -21,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVO
 
 WRKSRC=		${WRKDIR}/${PORTNAME:S/p/P/:S/c/C/}
 
-USES=		dos2unix python:2 zip
+USES=		dos2unix python:2.7 zip
 DOS2UNIX_REGEX=	.*.[^p][^n][^g]$
 
 SUB_FILES=	${PORTNAME}
diff --git a/games/pythonsudoku/Makefile b/games/pythonsudoku/Makefile
index 82208b1db70c..5c3d4093877d 100644
--- a/games/pythonsudoku/Makefile
+++ b/games/pythonsudoku/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pythonsudoku
 PORTVERSION=	0.13
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/Python%20Sudoku/${PORTVERSION}/ \
 		SF/nemysisfreebsdp/games/:icons
@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYGAME} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=0:graphics/py-pillow@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab1>=0:print/py-reportlab1@${FLAVOR}
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_GNOME=	pygtk2
 USE_PYTHON=	distutils
 INSTALLS_ICONS=	yes
diff --git a/games/pytowerdefense/Makefile b/games/pytowerdefense/Makefile
index 4e72902ea096..7984b59778e0 100644
--- a/games/pytowerdefense/Makefile
+++ b/games/pytowerdefense/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pytowerdefense
 PORTVERSION=	0.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games python
 MASTER_SITES=	SF/${PORTNAME}/PyTowerDefense0.5/Source%20%28Python%202.5%20or%202.6%20and%20Pygame%29/
 DISTNAME=	${PORTNAME}${DISTVERSION}
@@ -16,7 +16,7 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYGAME}
 
-USES=		python:2 shebangfix zip
+USES=		python:2.7 shebangfix zip
 SHEBANG_FILES=	pyconsole.py
 INSTALLS_ICONS=	yes
 NO_ARCH=	yes
diff --git a/games/schiff/Makefile b/games/schiff/Makefile
index 7a57490f72b9..1b198c66f3e3 100644
--- a/games/schiff/Makefile
+++ b/games/schiff/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	schiff
 PORTVERSION=	16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games python
 MASTER_SITES=	SF/pygamebook/${PORTNAME:S/s/S/}/${PORTNAME}${PORTVERSION}.py/ \
 		SF/nemysisfreebsdp/games/:icons
@@ -19,7 +19,7 @@ LICENSE=	GPLv2+
 
 RUN_DEPENDS=	${PYGAME}
 
-USES=		python:2,run shebangfix
+USES=		python:2.7,run shebangfix
 SHEBANG_FILES=	schiff.py
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
diff --git a/games/schwarzweiss/Makefile b/games/schwarzweiss/Makefile
index 5d14576b2556..40603367b095 100644
--- a/games/schwarzweiss/Makefile
+++ b/games/schwarzweiss/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	schwarzweiss
 PORTVERSION=	20110806
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games python
 MASTER_SITES=	SF/nemysisfreebsdp/games/:icons
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -23,7 +23,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	horstjens
 GH_TAGNAME=	d95263f
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	schwarzweiss_start.py data/*.py
 
 PORTDOCS=	readme.txt
diff --git a/games/secrettower/Makefile b/games/secrettower/Makefile
index 28de27c6ae16..3593a369cea1 100644
--- a/games/secrettower/Makefile
+++ b/games/secrettower/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	secrettower
 PORTVERSION=	0.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games python
 DIST_SUBDIR=	python
 
@@ -20,7 +20,7 @@ GH_ACCOUNT=	dusty141
 GH_PROJECT=	TheSecretTower
 GH_TAGNAME=	ecf13e4
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	TheSecretTower.py server.py
 
 PORTDOCS=	README
diff --git a/games/super_mario_bros_python/Makefile b/games/super_mario_bros_python/Makefile
index d2e149630a4a..d7129845590c 100644
--- a/games/super_mario_bros_python/Makefile
+++ b/games/super_mario_bros_python/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	super_mario_bros_python
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games python
 MASTER_SITES=	SF/supermariobrosp/ \
 		SF/nemysisfreebsdp/games/:icons
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}/Super-Mario-Bros-Python-v${DISTVERSION}release
 
-USES=		shebangfix python:2 zip
+USES=		shebangfix python:2.7 zip
 SHEBANG_FILES=	gamelib/*.py start.py
 
 PORTDOCS=	changelog.txt readme.txt
diff --git a/games/tuxfighter/Makefile b/games/tuxfighter/Makefile
index 43a8ccd085fa..7cca91acf3af 100644
--- a/games/tuxfighter/Makefile
+++ b/games/tuxfighter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tuxfighter
 PORTVERSION=	54
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	games python
 MASTER_SITES=	SF/pygamebook/TuxFighter/TuxFighter${PORTVERSION}_source/ \
 		SF/nemysisfreebsdp/games/:icons
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYGAME}
 
 WRKSRC=		${WRKDIR}
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	TuxFighter54.py
 
 PORTDOCS=	readme_TuxFighter54.txt
diff --git a/games/unknown-horizons/Makefile b/games/unknown-horizons/Makefile
index 1a69f8bd8ce1..ee3ff6c8ebc4 100644
--- a/games/unknown-horizons/Makefile
+++ b/games/unknown-horizons/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	unknown-horizons
 PORTVERSION=	2013.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 
 MAINTAINER=	fiziologus@gmail.com
@@ -23,7 +23,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_GITHUB=	yes
 
 USE_GNOME=	intltool
-USES=		gettext-tools python:2 tar:xz
+USES=		gettext-tools python:2.7 tar:xz
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	UnknownHorizons
 
diff --git a/games/wxlauncher/Makefile b/games/wxlauncher/Makefile
index 95cf8f9bb394..148f77fbff93 100644
--- a/games/wxlauncher/Makefile
+++ b/games/wxlauncher/Makefile
@@ -20,7 +20,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	scp-fs2open
 GH_PROJECT=	wxLauncher
 
-USES=		cmake:outsource openal pkgconfig python:2,build
+USES=		cmake:outsource openal pkgconfig python:2.7,build
 USE_SDL=	sdl2
 CMAKE_ARGS+=	-DRESOURCES_PATH:STRING="${DATADIR}"
 
diff --git a/games/zephulor/Makefile b/games/zephulor/Makefile
index 396d2598ffad..316ca3145025 100644
--- a/games/zephulor/Makefile
+++ b/games/zephulor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zephulor
 PORTVERSION=	1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	SF/apz/apz/stable/ \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
@@ -22,7 +22,7 @@ RUN_DEPENDS=	${PYGAME} \
 
 WRKSRC=		${WRKDIR}/zephulor-source
 
-USES=		python:2
+USES=		python:2.7
 NO_BUILD=	yes
 
 PORTDOCS=	*
diff --git a/graphics/electrix/Makefile b/graphics/electrix/Makefile
index 69604f9321c0..5f1f9a2e72be 100644
--- a/graphics/electrix/Makefile
+++ b/graphics/electrix/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	electrix
 PORTVERSION=	0.2.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics print
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTVERSION}
 
@@ -11,7 +11,7 @@ COMMENT=	Application to view PDF files
 
 LICENSE=	GPLv2
 
-USES=		desktop-file-utils pkgconfig python:2 tar:bzip2 waf
+USES=		desktop-file-utils pkgconfig python:2.7 tar:bzip2 waf
 USE_GNOME=	gtk20 glib20 intltool intlhack
 
 MAKE_ENV=	DESTDIR="${STAGEDIR}" \
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index ff4d298212a6..95699610e645 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gsculpt
 PORTVERSION=	0.99.47
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,}
 DISTNAME=	gSculpt-${PORTVERSION}-alpha-src
@@ -24,7 +24,7 @@ BROKEN_sparc64=		fails to compile
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S,-src,,}
 
-USES=		pkgconfig python:2 scons
+USES=		pkgconfig python:2.7 scons
 USE_GNOME=	pygtk2
 USE_GL=		glu
 USE_XORG=	x11
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index 7a4d70e576d1..ee086081d87b 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	inkscape
 PORTVERSION=	0.92.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics gnome
 MASTER_SITES=	https://launchpadlibrarian.net/332184472/ \
 		https://inkscape.org/en/gallery/item/11254/ \
@@ -33,7 +33,7 @@ LIB_DEPENDS=	libpopt.so:devel/popt \
 
 USE_GNOME=	gtkmm24 libxml2 libxslt
 USES=		compiler:c++11-lib cmake cpe desktop-file-utils gnome \
-		iconv:wchar_t jpeg pathfix pkgconfig python:2,build \
+		iconv:wchar_t jpeg pathfix pkgconfig python:2.7,build \
 		shebangfix tar:bzip2
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
@@ -81,7 +81,7 @@ USES+=			gettext
 #NLS_USES=		gettext
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|COMMAND python|COMMAND python2|g' \
+	@${REINPLACE_CMD} -e 's|COMMAND python|COMMAND ${PYTHON_VERSION}|g' \
 		${WRKSRC}/share/*/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/graphics/lcms-python/Makefile b/graphics/lcms-python/Makefile
index 03ff2cfde99b..16fb7dc9cc07 100644
--- a/graphics/lcms-python/Makefile
+++ b/graphics/lcms-python/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	lcms
 PORTVERSION=	1.19
+PORTREVISION=	1
 CATEGORIES=	graphics devel python
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-python
@@ -17,7 +18,7 @@ LIB_DEPENDS=	liblcms.so:graphics/lcms
 BUILD_WRKSRC=	${WRKSRC}/python
 INSTALL_WRKSRC=	${WRKSRC}/python
 
-USES=		python:2
+USES=		python:2.7
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-python
 CONFIGURE_ENV=	PYTHON="${PYTHON_CMD}"
diff --git a/graphics/lcms-python/files/patch-configure b/graphics/lcms-python/files/patch-configure
new file mode 100644
index 000000000000..6c99e9790c5b
--- /dev/null
+++ b/graphics/lcms-python/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2018-02-06 01:53:28 UTC
++++ configure
+@@ -5287,7 +5287,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ 
+-	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
++	for am_cv_pathless_PYTHON in python python2 python2.7 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
+ 	  test "$am_cv_pathless_PYTHON" = none && break
+ 	  prog="import sys, string
+ # split strings by '.' and convert to numeric.  Append some zeros
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index 07407c51b7e3..dd4e6b33e142 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		mapserver
 PORTVERSION=		7.0.7
+PORTREVISION=	1
 CATEGORIES=		graphics www geography
 MASTER_SITES=		http://download.osgeo.org/mapserver/
 
@@ -43,7 +44,7 @@ WCS_DESC=		WCS Server support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPYTHON}
-USES+=			python:2
+USES+=			python:2.7
 BUILD_DEPENDS+=		swig3.0:devel/swig30
 BINARY_ALIAS=		swig=swig3.0
 CMAKE_ARGS+=		-DWITH_PYTHON=yes
diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 991e5ff89a11..13cdf2999ac3 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mypaint
 PORTVERSION=	1.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/mypaint/mypaint/releases/download/${PORTVERSION:S/^/v/}/
 
@@ -32,7 +32,7 @@ MAKE_ARGS=	prefix=${PREFIX} \
 		python_config="${PYTHON_CMD}-config"
 # XXX Embed RPATH via USES=fortran for py-numpy to load libgcc_s.so from ports
 USES=		desktop-file-utils fortran gettext localbase \
-		pkgconfig python:2 scons tar:xz
+		pkgconfig python:2.7 scons tar:xz
 INSTALL_TARGET=	${STAGEDIR} --install-sandbox=${STAGEDIR}
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/graphics/opencolorio/Makefile b/graphics/opencolorio/Makefile
index 1c0a663d1fc1..a4b432a7bd62 100644
--- a/graphics/opencolorio/Makefile
+++ b/graphics/opencolorio/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	opencolorio
 PORTVERSION=	1.0.9
-PORTREVISION?=	4
+PORTREVISION?=	5
 CATEGORIES=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -72,7 +72,7 @@ PLIST=		${PKGDIR}/pkg-plist-pyglue
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
 LIB_DEPENDS=	libtinyxml.so:textproc/tinyxml \
 		libyaml-cpp03.so:devel/yaml-cpp03
-USES+=		python:2,build
+USES+=		python:2.7,build
 USE_LDCONFIG=	yes
 CMAKE_ARGS+=	-DOCIO_BUILD_APPS:BOOL=OFF \
 		-DOCIO_BUILD_SHARED:BOOL=ON \
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 0892e058d83b..acb4def768dd 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	openimageio
 PORTVERSION=	1.7.17
 DISTVERSIONPREFIX=	Release-
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES?=	graphics multimedia
 
 MAINTAINER?=	FreeBSD@Shaneware.biz
@@ -97,7 +97,7 @@ LIB_DEPENDS+=	libOpenImageIO.so:graphics/openimageio \
 		${PY_BOOST}
 PLIST=		${PKGDIR}/pkg-plist-pybind
 #while oiio supports py3, ports doesn't have py3 support for boost-python yet
-USES+=		python:2
+USES+=		python:2.7
 CMAKE_ARGS+=	-DUSE_PYTHON:BOOL=ON -DUSE_PYTHON3:BOOL=OFF \
 		-DOIIO_BUILD_TOOLS:BOOL=OFF -DUSE_FFMPEG:BOOL=OFF
 .endif
diff --git a/graphics/piglit/Makefile b/graphics/piglit/Makefile
index 02a73554d7ed..a1866bdd8299 100644
--- a/graphics/piglit/Makefile
+++ b/graphics/piglit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	piglit
 PORTVERSION=	20170922
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	x11@FreeBSD.org
@@ -29,7 +30,7 @@ GH_ACCOUNT=	dumbbell
 GH_PROJECT=	piglit
 GH_TAGNAME=	60996b829c85f3df192bc6228108c0a8eaa38afd
 
-USES=		cmake:outsource compiler:c11 pkgconfig python:2
+USES=		cmake:outsource compiler:c11 pkgconfig python:2.7
 USE_GL=		egl gbm gl glu
 USE_XORG=	x11 xcb xext xrender
 
diff --git a/graphics/py-blockdiagcontrib-cisco/Makefile b/graphics/py-blockdiagcontrib-cisco/Makefile
index 2254f8e81db8..ff83c9d63633 100644
--- a/graphics/py-blockdiagcontrib-cisco/Makefile
+++ b/graphics/py-blockdiagcontrib-cisco/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	blockdiagcontrib-cisco
 PORTVERSION=	0.1.8
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Networking shapes for blockdiag designed by Cisco
 
 RUN_DEPENDS=	${PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/graphics/py-djvulibre/Makefile b/graphics/py-djvulibre/Makefile
index 7e08147170ec..82052ff02062 100644
--- a/graphics/py-djvulibre/Makefile
+++ b/graphics/py-djvulibre/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	python-djvulibre
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
 
-USES=		python:2 pkgconfig
+USES=		python:2.7 pkgconfig
 USE_PYTHON=	autoplist distutils cython
 
 post-patch:
diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile
index 2bcf6014f382..579678f4403c 100644
--- a/graphics/py-exiv2/Makefile
+++ b/graphics/py-exiv2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	exiv2
 PORTVERSION=	0.3.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics python
 MASTER_SITES=	https://launchpadlibrarian.net/83595798/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ COMMENT=	Python bindings for exiv2
 LIB_DEPENDS=	libexiv2.so:graphics/exiv2\
 		${PY_BOOST}
 
-USES=		python:2 scons tar:bzip2
+USES=		python:2.7 scons tar:bzip2
 USE_PYTHON=	flavors
 USE_LDCONFIG=	yes
 CXXFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/py-gimp/Makefile b/graphics/py-gimp/Makefile
index 3cb8f61083db..84955f8fabb5 100644
--- a/graphics/py-gimp/Makefile
+++ b/graphics/py-gimp/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gimp
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	0
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=
@@ -12,7 +12,7 @@ COMMENT=	GIMP python plugin
 
 GIMP_SLAVE=	pygimp
 
-USES=		python:2
+USES=		python:2.7
 USE_GNOME=	pygtk2
 
 CONFIGURE_ARGS=	--enable-python
diff --git a/graphics/py-pivy/Makefile b/graphics/py-pivy/Makefile
index f845b78b3db6..0210129c27f7 100644
--- a/graphics/py-pivy/Makefile
+++ b/graphics/py-pivy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pivy
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	https://bitbucket.org/Coin3D/pivy/get/
 DISTNAME=	8eab90908f2a
@@ -17,7 +18,7 @@ LIB_DEPENDS=	libSoQt.so:x11-toolkits/soqt
 
 BROKEN_powerpc64=	fails to link: coin_wrap.o: relocation truncated to fit: R_PPC64_TOC16_DS
 
-USES=		zip python:2
+USES=		zip python:2.7
 USE_PYTHON=	autoplist distutils
 BINARY_ALIAS=	swig=swig3.0
 
diff --git a/graphics/py-sk1/Makefile b/graphics/py-sk1/Makefile
index f826d212abe7..7004b4421957 100644
--- a/graphics/py-sk1/Makefile
+++ b/graphics/py-sk1/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sk1
 DISTVERSION=	g20171127
+PORTREVISION=	1
 CATEGORIES=	graphics python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -19,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycups>0:print/py-pycups@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${FLAVOR}
 
-USES=		desktop-file-utils python:2
+USES=		desktop-file-utils python:2.7
 USE_GITHUB=	yes
 GH_ACCOUNT=	sk1project
 GH_PROJECT=	sk1-wx
diff --git a/graphics/pymorph/Makefile b/graphics/pymorph/Makefile
index 8a6c2b37ab9c..5255e9091686 100644
--- a/graphics/pymorph/Makefile
+++ b/graphics/pymorph/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pymorph
 PORTVERSION=	0.96
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 
@@ -14,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS+=	${PYNUMPY}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/graphics/pysvg/Makefile b/graphics/pysvg/Makefile
index d098f2aedbca..48cb90863fe7 100644
--- a/graphics/pysvg/Makefile
+++ b/graphics/pysvg/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pysvg
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 
@@ -11,7 +12,7 @@ COMMENT=	pySVG - creating svg with python
 
 LICENSE=	BSD2CLAUSE
 
-USES=	zip python:2
+USES=	zip python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/graphics/variety/Makefile b/graphics/variety/Makefile
index 5ad2a271db23..6a585bfe0a54 100644
--- a/graphics/variety/Makefile
+++ b/graphics/variety/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	variety
 PORTVERSION=	0.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	https://launchpad.net/variety/trunk/${PORTVERSION}/+download/ \
 		http://nivit.altervista.org/FreeBSD/ports/distfiles/
@@ -38,7 +38,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.3.2:www/py-beautifulsoup@${
 
 SHEBANG_FILES=	bin/variety data/scripts/*
 
-USES=	desktop-file-utils gettext python:2 shebangfix gnome
+USES=	desktop-file-utils gettext python:2.7 shebangfix gnome
 USE_GNOME=	pygobject3:run
 USE_PYTHON=	distutils
 
diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile
index ffee856370db..1093c72b2b09 100644
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vigra
 DISTVERSION=	1.11.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LIB_DEPENDS=	libHalf.so:graphics/ilmbase \
 		libsz.so:science/szip
 
-USES=		cmake:outsource python:2,run shebangfix
+USES=		cmake:outsource python:2.7,run shebangfix
 CMAKE_ARGS=	-DDEPENDENCY_SEARCH_PREFIX:PATH=${LOCALBASE} \
 		-DDOCINSTALL:PATH=${DOCSDIR_REL}
 
@@ -44,7 +44,7 @@ OPENEXR_LIB_DEPENDS=	libIlmImf.so:graphics/OpenEXR
 
 NUMPY_DESC=		NumPy mathematical computing (USE Fortran/GCC47+)
 NUMPY_CMAKE_BOOL=	WITH_VIGRANUMPY
-NUMPY_USES=		compiler:gcc-c++11-lib python:2,build
+NUMPY_USES=		compiler:gcc-c++11-lib python:2.7,build
 NUMPY_BUILD_DEPENDS=	nosetests:devel/py-nose \
 			f2py:math/py-numpy
 NUMPY_RUN_DEPENDS=	nosetests:devel/py-nose \
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index 12194f5b7f92..cba3a0d5208c 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zbar
 PORTVERSION=	0.10
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	SF
 
@@ -37,7 +37,7 @@ V4L_CONFIGURE_ON=	--enable-video=yes
 V4L_CONFIGURE_OFF=	--enable-video=no
 
 PYTHON_USE=		GNOME=pygtk2
-PYTHON_USES=		python:2
+PYTHON_USES=		python:2.7
 PYTHON_CONFIGURE_ON=	--with-python=yes
 PYTHON_CONFIGURE_OFF=	--with-python=no
 
diff --git a/japanese/mailman/Makefile b/japanese/mailman/Makefile
index 57b95dc6edf5..c78294a8ea2c 100644
--- a/japanese/mailman/Makefile
+++ b/japanese/mailman/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mailman
 PORTVERSION=	2.1.14.j7
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	japanese mail
 MASTER_SITES=	http://www.python.jp/doc/contrib/mailman/_static/ \
@@ -21,7 +21,7 @@ CONFLICTS=	mailman-2.1.*
 
 PORTSCOUT=	limit:.*\.j\d+$$
 
-USES=		autoreconf gettext python:2 tar:tgz
+USES=		autoreconf gettext python:2.7 tar:tgz
 USE_RC_SUBR=	mailman
 
 GNU_CONFIGURE=	yes
diff --git a/japanese/tegaki-recognize/Makefile b/japanese/tegaki-recognize/Makefile
index 5e49c8a1d156..2b2815ed6851 100644
--- a/japanese/tegaki-recognize/Makefile
+++ b/japanese/tegaki-recognize/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tegaki
 PORTVERSION=	0.3.1.2
+PORTREVISION=	1
 CATEGORIES=	japanese python
 MASTER_SITES=	http://www.tegaki.org/releases/${PORTVERSION:.2=}/
 PKGNAMESUFFIX=	-recognize
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:japanese/py-tegaki-gtk
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	${PORTNAME}_recognize
 
diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile
index e6db458fe055..4e8fd68b884b 100644
--- a/lang/py-mx-base/Makefile
+++ b/lang/py-mx-base/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mx-base
 PORTVERSION=	3.2.9
+PORTREVISION=	1
 CATEGORIES=	lang python
 MASTER_SITES=	http://downloads.egenix.com/python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LICENSE_NAME=	EGENIX.COM Public License
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	egenix-mx-base
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}-nspkg.pth
diff --git a/lang/spidermonkey170/Makefile b/lang/spidermonkey170/Makefile
index 7fa01b85d181..3deccbcd5939 100644
--- a/lang/spidermonkey170/Makefile
+++ b/lang/spidermonkey170/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=		libnspr4.so:devel/nspr
 CONFLICTS=		njs-[0-9]*
 
 GNU_CONFIGURE=		yes
-USES=			gmake pathfix perl5 python:2,build
+USES=			gmake pathfix perl5 python:2.7,build
 USE_PERL5=		build
 USE_LDCONFIG=		yes
 
diff --git a/lang/spidermonkey185/Makefile b/lang/spidermonkey185/Makefile
index a6602d694a12..52ede6c4a8dd 100644
--- a/lang/spidermonkey185/Makefile
+++ b/lang/spidermonkey185/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=		libnspr4.so:devel/nspr
 
 CONFLICTS=		njs-[0-9]*
 
-USES=			gmake pathfix perl5 pkgconfig python:2,build
+USES=			gmake pathfix perl5 pkgconfig python:2.7,build
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
 USE_PERL5=		build
diff --git a/lang/spidermonkey24/Makefile b/lang/spidermonkey24/Makefile
index b63d08b1f06b..e144e1bb734a 100644
--- a/lang/spidermonkey24/Makefile
+++ b/lang/spidermonkey24/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=		libnspr4.so:devel/nspr
 CONFLICTS=		njs-[0-9]*
 
 GNU_CONFIGURE=		yes
-USES=			compiler:c++11-lib gmake pathfix perl5 python:2,build \
+USES=			compiler:c++11-lib gmake pathfix perl5 python:2.7,build \
 			readline tar:bzip2
 USE_PERL5=		build
 USE_LDCONFIG=		yes
diff --git a/lang/v8-devel/Makefile b/lang/v8-devel/Makefile
index 83572b39f7fe..70b50d0b8246 100644
--- a/lang/v8-devel/Makefile
+++ b/lang/v8-devel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	v8
 PORTVERSION=	3.27.7
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/vanilla
 PKGNAMESUFFIX=	-devel
@@ -24,7 +24,7 @@ MAKE_ARGS=	library=shared use_system_icu=on
 MAKE_ENV=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 USE_LDCONFIG=	yes
 USE_CXXSTD=	gnu++11
-USES=		compiler:c++11-lib cpe gmake localbase python:2 shebangfix tar:xz
+USES=		compiler:c++11-lib cpe gmake localbase python:2.7 shebangfix tar:xz
 
 CPE_VENDOR=	google
 
diff --git a/lang/v8/Makefile b/lang/v8/Makefile
index cc4b0ff78bed..032c622bc79f 100644
--- a/lang/v8/Makefile
+++ b/lang/v8/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	v8
 PORTVERSION=	3.18.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	LOCAL/vanilla
 
@@ -22,7 +22,7 @@ ALL_TARGET=	native
 MAKE_ARGS=	library=shared
 MAKE_ENV=	CC.host=${CC} CXX.host=${CXX} LINK.host=${CXX} LINK.target=${CXX}
 USE_LDCONFIG=	yes
-USES=		alias compiler cpe gmake python:2 shebangfix tar:xz
+USES=		alias compiler cpe gmake python:2.7 shebangfix tar:xz
 
 CPE_VENDOR=	google
 
diff --git a/mail/getmail/Makefile b/mail/getmail/Makefile
index 6311b11f4f12..74002f03f5bb 100644
--- a/mail/getmail/Makefile
+++ b/mail/getmail/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	getmail
 PORTVERSION=	5.5
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	http://pyropus.ca/software/getmail/old-versions/
 
@@ -12,7 +13,7 @@ COMMENT=	POP3/IMAP4 mail retriever with Maildir and command delivery
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/docs/COPYING
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 NO_ARCH=	yes
 
diff --git a/mail/py-milter/Makefile b/mail/py-milter/Makefile
index f6433c7be63d..ee13db5c7415 100644
--- a/mail/py-milter/Makefile
+++ b/mail/py-milter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	milter
 PORTVERSION=	1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail python
 MASTER_SITES=	SF/${PYPORTNAME}/${PYPORTNAME}/${DISTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -23,7 +23,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 
 PYPORTNAME=	${PKGNAMEPREFIX:C/[0-9]+-//}${PORTNAME}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-install:
diff --git a/mail/py-zope.sendmail/Makefile b/mail/py-zope.sendmail/Makefile
index 3f3f65140290..a92cd13790f5 100644
--- a/mail/py-zope.sendmail/Makefile
+++ b/mail/py-zope.sendmail/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	zope.sendmail
 PORTVERSION=	3.7.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}transaction>=0:devel/py-transaction@${FLAVOR
 		${PYTHON_PKGNAMEPREFIX}zope.configuration>=0:devel/py-zope.configuration@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}zope.security>=0:security/py-zope.security@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/mail/rss2email2/Makefile b/mail/rss2email2/Makefile
index a5d279feee23..3e0ad821cf32 100644
--- a/mail/rss2email2/Makefile
+++ b/mail/rss2email2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rss2email
 PORTVERSION=	2.71
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail python
 MASTER_SITES=	http://www.allthingsrss.com/rss2email/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ LICENSE_COMB=	dual
 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
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	rss2email.py
 NO_ARCH=	yes
 NO_BUILD=	yes
diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile
index 0ba4ab4ba6e0..8a4cfc3a7c6c 100644
--- a/mail/svnmailer/Makefile
+++ b/mail/svnmailer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	svnmailer
 DISTVERSION=	1.1.0-dev-r1373
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	mail python
 MASTER_SITES=	http://storage.perlig.de/${PORTNAME}/
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
@@ -14,7 +14,7 @@ COMMENT=	Tool to post subversion repository commit information
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>0:devel/py-subversion@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 
diff --git a/math/biggles/Makefile b/math/biggles/Makefile
index 691fadbe169f..66a81fe7c4b7 100644
--- a/math/biggles/Makefile
+++ b/math/biggles/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	biggles
 PORTVERSION=	1.6.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	SF
 DISTNAME=	python2-${PORTNAME}-${PORTVERSION}
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libplot.so:graphics/plotutils
 
-USES=		gmake python:2
+USES=		gmake python:2.7
 MAKE_ARGS=	CC="${CC}" \
 		CFLAGS="${CFLAGS} -fPIC" \
 		LIBPLOT_CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/math/cadabra2/Makefile b/math/cadabra2/Makefile
index b244867e8860..495d5fc45ab1 100644
--- a/math/cadabra2/Makefile
+++ b/math/cadabra2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cadabra2
 DISTVERSION=	2.1.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -26,7 +26,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/sympy/__init__.py:math/py-sympy@${PY_FLAVOR} \
 OPTIONS_DEFINE=	GUI
 OPTIONS_DEFAULT=GUI
 
-USES=		compiler:c++14-lang cmake gettext-runtime pkgconfig python:2 sqlite
+USES=		compiler:c++14-lang cmake gettext-runtime pkgconfig python:2.7 sqlite
 USE_GITHUB=	yes
 GH_ACCOUNT=	kpeeters
 GUI_USE=	GNOME=gtkmm30,gdkpixbuf2
diff --git a/math/cantor/Makefile b/math/cantor/Makefile
index 6f1c4a5e0e53..74bb82e81f2f 100644
--- a/math/cantor/Makefile
+++ b/math/cantor/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cantor
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	math kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
@@ -12,7 +12,7 @@ LIB_DEPENDS=	libspectre.so:print/libspectre \
 		libqalculate.so:math/libqalculate \
 		libanalitza.so:math/analitza
 
-USES=		cmake:outsource kde:4 pkgconfig python:2 tar:xz
+USES=		cmake:outsource kde:4 pkgconfig python:2.7 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_QT4=	corelib qtestlib_build xml xmlpatterns \
 		moc_build qmake_build rcc_build uic_build
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 5878076206d1..e2236e12edf4 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gnumeric
 PORTVERSION=	1.12.28
+PORTREVISION=	1
 CATEGORIES=	math gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -19,7 +20,7 @@ LIB_DEPENDS=	libgoffice-0.10.so:devel/goffice010 \
 RUN_DEPENDS=	rarian-sk-config:textproc/rarian
 
 USES=		cpe desktop-file-utils gettext gmake libtool pathfix pkgconfig \
-		python:2 shebangfix tar:xz
+		python:2.7 shebangfix tar:xz
 USE_GNOME=	intlhack libgsf pygobject3
 INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
diff --git a/math/hfst/Makefile b/math/hfst/Makefile
index 62b3f180ba64..e94bb4ab024a 100644
--- a/math/hfst/Makefile
+++ b/math/hfst/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hfst
 PORTVERSION=	3.13.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	demon@FreeBSD.org
@@ -13,7 +14,7 @@ BROKEN=		fails to build
 USE_GITHUB=	yes
 GH_TAGNAME=	c187d5a
 
-USES=		autoreconf libtool pathfix pkgconfig python:2 readline shebangfix
+USES=		autoreconf libtool pathfix pkgconfig python:2.7 readline shebangfix
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline --enable-lexc-wrapper --enable-proc --enable-tagger --enable-train-tagger --enable-xfst --enable-shuffle --enable-traverse
diff --git a/math/nlopt/Makefile b/math/nlopt/Makefile
index 4f15bb64682b..7bc82a8e1f51 100644
--- a/math/nlopt/Makefile
+++ b/math/nlopt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nlopt
 PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	http://ab-initio.mit.edu/nlopt/
 
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=	SWIG="${LOCALBASE}/bin/swig3.0"
 
 USES=		autoreconf compiler:features libtool pathfix \
-		pkgconfig python:2
+		pkgconfig python:2.7
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
diff --git a/math/openfst/Makefile b/math/openfst/Makefile
index e4b2326cd0d2..c42dee8c9fb4 100644
--- a/math/openfst/Makefile
+++ b/math/openfst/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	openfst
 PORTVERSION=	1.6.3
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://www.openfst.org/twiki/pub/FST/FstDownload/
 
@@ -11,7 +12,7 @@ COMMENT=	Library for working with weighted finite-state transducers (FSTs)
 
 LICENSE=	APACHE20
 
-USES=		compiler:c++11-lib libtool python:2
+USES=		compiler:c++11-lib libtool python:2.7
 USE_LDCONFIG=	${LOCALBASE}/lib/fst
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-bin --enable-compact-fsts --enable-compress --enable-const-fsts --enable-far --enable-linear-fsts --enable-lookahead-fsts --enable-mpdt --enable-ngram-fsts --enable-pdt --enable-python --enable-special
diff --git a/math/py-bitmath/Makefile b/math/py-bitmath/Makefile
index 6189312e2857..9ab648b42a26 100644
--- a/math/py-bitmath/Makefile
+++ b/math/py-bitmath/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	bitmath
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Represent and manipulate file sizes with different prefix notations
 
 LICENSE=	MIT
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-4
diff --git a/math/py-ffc/Makefile b/math/py-ffc/Makefile
index 3ea812c2e3c1..1f5d7a64a66d 100644
--- a/math/py-ffc/Makefile
+++ b/math/py-ffc/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ffc
 PORTVERSION=	${MMVERSION}.0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/${MMVERSION}.x/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	C++ code generator for multilinear forms
 
 LICENSE=	LGPL3
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 PYDISTUTILS_PKGNAME=	FFC
 
diff --git a/math/py-fiat/Makefile b/math/py-fiat/Makefile
index 0accbd16b493..66e3aa37e314 100644
--- a/math/py-fiat/Makefile
+++ b/math/py-fiat/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fiat
 PORTVERSION=	${MMVERSION}.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math python
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/${MMVERSION}.x/release-${MMVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	LGPL3
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}scientific>=0:math/py-scientific@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 MMVERSION=	1.1
diff --git a/math/py-fpconst/Makefile b/math/py-fpconst/Makefile
index 208e69f0033e..ef1172fd5d9b 100644
--- a/math/py-fpconst/Makefile
+++ b/math/py-fpconst/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	fpconst
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for handling IEEE 754 floating point special values
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index 65546ec16d74..de3eefe50f2e 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gato
 PORTVERSION=	1.2.2
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${FLAVOR}
 
 NO_ARCH=	yes
 PORTEXAMPLES=	*
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 post-install:
diff --git a/math/py-gmpy2/Makefile b/math/py-gmpy2/Makefile
index 6d59bdb2b690..434cb3a05817 100644
--- a/math/py-gmpy2/Makefile
+++ b/math/py-gmpy2/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gmpy2
 PORTVERSION=	2.0.8
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 
 post-install:
diff --git a/math/py-symeig/Makefile b/math/py-symeig/Makefile
index 3dba3d4e63b7..2b6b93975ed7 100644
--- a/math/py-symeig/Makefile
+++ b/math/py-symeig/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	symeig
 PORTVERSION=	1.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	math python
 MASTER_SITES=	SF/mdp-toolkit/mdp-toolkit/2.4
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE
 BUILD_DEPENDS+=	${PYNUMPY}
 RUN_DEPENDS+=	${PYNUMPY}
 
-USES=		fortran python:2
+USES=		fortran python:2.7
 USE_PYTHON=	distutils autoplist
 
 LDFLAGS+=	-shared
diff --git a/math/py-ufl/Makefile b/math/py-ufl/Makefile
index dc1288f78739..64f8f15e5843 100644
--- a/math/py-ufl/Makefile
+++ b/math/py-ufl/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ufl
 PORTVERSION=	${MMVERSION}0
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/${MMVERSION}.x/${MMVERSION}.0/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Unified Form Language for finite element discretizations
 
 LICENSE=	LGPL3
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 MMVERSION=	1.2
diff --git a/math/py-viper/Makefile b/math/py-viper/Makefile
index 0aae61cb1e97..a5373990862a 100644
--- a/math/py-viper/Makefile
+++ b/math/py-viper/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	viper
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	math python
 MASTER_SITES=	https://launchpad.net/fenics-${PORTNAME}/${MMVERSION}.x/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ COMMENT=	Minimalistic scientific plotter and visualization module
 
 LICENSE=	LGPL3
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-patch:
diff --git a/math/saga/Makefile b/math/saga/Makefile
index 469bee427368..9a0484e95079 100644
--- a/math/saga/Makefile
+++ b/math/saga/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	saga
 PORTVERSION=	6.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
 
@@ -29,7 +29,7 @@ LIB_DEPENDS=	libfftw3.so:math/fftw3 \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		autoreconf compiler:gcc-c++11-lib desktop-file-utils dos2unix \
-		iconv:wchar_t libtool localbase pkgconfig python:2
+		iconv:wchar_t libtool localbase pkgconfig python:2.7
 USE_LDCONFIG=	yes
 USE_CXXSTD=	c++11
 USE_WX=		3.0+
diff --git a/math/ufc/Makefile b/math/ufc/Makefile
index a7d47e060ba3..00b9a32154ae 100644
--- a/math/ufc/Makefile
+++ b/math/ufc/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ufc
 PORTVERSION=	${MMVERSION}.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math python
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/${MMVERSION}.x/${PORTVERSION}/+download/
 
@@ -14,7 +14,7 @@ LIB_DEPENDS=	libboost_math_c99.so:devel/boost-libs
 
 # LICENSE=	public domain
 
-USES=		cmake python:2
+USES=		cmake python:2.7
 
 CMAKE_ARGS+=	-DUFC_PKGCONFIG_DIR=${PREFIX}/libdata/pkgconfig
 
diff --git a/misc/gimp-help-en/Makefile b/misc/gimp-help-en/Makefile
index 6babed3c1866..403482c5a3c7 100644
--- a/misc/gimp-help-en/Makefile
+++ b/misc/gimp-help-en/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gimp-help
 PORTVERSION=	2.8.2
+PORTREVISION=	1
 CATEGORIES?=	misc graphics
 MASTER_SITES=	http://gimp.mirrors.hoobly.com/pub/%SUBDIR%/ \
 		http://ftp.gwdg.de/pub/misc/grafik/%SUBDIR%/ \
@@ -19,7 +20,7 @@ LICENSE=	GFDL
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${PY_FLAVOR} \
 		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:textproc/docbook-xsl
 
-USES=		gettext-tools gmake perl5 pkgconfig python:2 shebangfix tar:bzip2
+USES=		gettext-tools gmake perl5 pkgconfig python:2.7 shebangfix tar:bzip2
 USE_GNOME=	libxslt:build
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
diff --git a/misc/py-progressbar231/Makefile b/misc/py-progressbar231/Makefile
index 8daaa003af17..5733ee606927 100644
--- a/misc/py-progressbar231/Makefile
+++ b/misc/py-progressbar231/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	progressbar231
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Text progressbar library for python
 LICENSE=	BSD3CLAUSE
 
 USE_PYTHON=	autoplist distutils
-USES=		python:2
+USES=		python:2.7
 
 CONFLICTS=	py*-progressbar
 
diff --git a/misc/py-python-geohash/Makefile b/misc/py-python-geohash/Makefile
index eb5088e0ecdf..949884ce10f5 100644
--- a/misc/py-python-geohash/Makefile
+++ b/misc/py-python-geohash/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	python-geohash
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Fast, accurate python geohashing library
 LICENSE=	APACHE20 MIT BSD3CLAUSE
 LICENSE_COMB=	multi
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/misc/py-yolk/Makefile b/misc/py-yolk/Makefile
index 9b1698f4ba99..ffe66e08540c 100644
--- a/misc/py-yolk/Makefile
+++ b/misc/py-yolk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	yolk
 PORTVERSION=	0.4.3
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	misc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Command-line tool for querying PyPI and Python packages installed
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 OPTIONS_DEFINE=	EXAMPLES
diff --git a/misc/typetrainer/Makefile b/misc/typetrainer/Makefile
index eefea301e8c1..805d0642813f 100644
--- a/misc/typetrainer/Makefile
+++ b/misc/typetrainer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	typetrainer
 PORTVERSION=	0.5.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc python
 MASTER_SITES=	CHEESESHOP
 
@@ -12,7 +12,7 @@ COMMENT=	Typing tutor trainer
 LICENSE=	MIT
 
 USE_GNOME=	pygtk2
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/misc/wotsap/Makefile b/misc/wotsap/Makefile
index 08193675701a..c764278b701c 100644
--- a/misc/wotsap/Makefile
+++ b/misc/wotsap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wotsap
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.lysator.liu.se/~jc/wotsap/download/
 EXTRACT_SUFX=	.tgz
@@ -13,7 +13,7 @@ COMMENT=	Web of trust statistics and pathfinder
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
 
-USES=		python:2,run shebangfix
+USES=		python:2.7,run shebangfix
 NO_BUILD=	yes
 SHEBANG_FILES=	wotsap pks2wot
 
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile
index 054cea904e85..bab9f054fda4 100644
--- a/multimedia/freevo/Makefile
+++ b/multimedia/freevo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freevo
 PORTVERSION=	1.9.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/${PORTNAME}/Freevo%20releases/${PORTVERSION}
 
@@ -39,7 +39,7 @@ SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD} \
 SUB_FILES=	pkg-message pkg-deinstall
 
 NO_ARCH=	yes
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_PYTHON=	distutils noegginfo
 PYDISTUTILS_INSTALLNOSINGLE=	yes
 PYDISTUTILS_SETUP=	${PYSETUP}
diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile
index be78aa6ef678..a8b0e89b9d8c 100644
--- a/multimedia/openshot/Makefile
+++ b/multimedia/openshot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openshot
 PORTVERSION=	1.4.3
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://launchpad.net/openshot/${PORTVERSION:C/\.[0-9]+$//}/${PORTVERSION}/+download/
 
@@ -24,7 +24,7 @@ RUN_DEPENDS=	ffmpeg:multimedia/ffmpeg \
 
 USE_GNOME=	pygtk2
 USE_PYTHON=	distutils
-USES=		desktop-file-utils gettext python:2 shared-mime-info
+USES=		desktop-file-utils gettext python:2.7 shared-mime-info
 INSTALLS_OMF=	yes
 
 post-patch:
diff --git a/multimedia/pitivi/files/patch-configure b/multimedia/pitivi/files/patch-configure
new file mode 100644
index 000000000000..b2fb8e0da5de
--- /dev/null
+++ b/multimedia/pitivi/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	2018-02-11 23:00:45 UTC
++++ configure
+@@ -2920,7 +2920,7 @@ $as_echo "$as_me: Using localstatedir $L
+ 
+ 
+ 
+-    PYTHON_CANDIDATES="python python2.2 python2.1 python2.0 python2 \
++    PYTHON_CANDIDATES="python python2.7 python2.2 python2.1 python2.0 python2 \
+                      python1.6 python1.5"
+ 
+      { $as_echo "$as_me:${as_lineno-$LINENO}: Looking for Python version >= 2.5" >&5
diff --git a/multimedia/plexpy/Makefile b/multimedia/plexpy/Makefile
index 5456001e35fe..d8de772361ac 100644
--- a/multimedia/plexpy/Makefile
+++ b/multimedia/plexpy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	plexpy
 PORTVERSION=	1.4.22
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 DISTVERSIONPREFIX=v
 
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 USE_RC_SUBR=	${PORTNAME}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	PlexPy.py
 python_OLD_CMD=	/bin/sh
 
diff --git a/multimedia/py-enzyme/Makefile b/multimedia/py-enzyme/Makefile
index d11096f2bd40..b8f10a0049aa 100644
--- a/multimedia/py-enzyme/Makefile
+++ b/multimedia/py-enzyme/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	enzyme
 PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Python module to parse metadata in video files
 
 LICENSE=	APACHE20
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/multimedia/py-flvlib/Makefile b/multimedia/py-flvlib/Makefile
index 8e6b77f3ff07..4748d89265c7 100644
--- a/multimedia/py-flvlib/Makefile
+++ b/multimedia/py-flvlib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	flvlib
 PORTVERSION=	0.1.13
+PORTREVISION=	1
 CATEGORIES=	multimedia python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Parsing, manipulating and indexing FLV files
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/multimedia/py-gstreamer/Makefile b/multimedia/py-gstreamer/Makefile
index c6e8b8388224..c08a30e93068 100644
--- a/multimedia/py-gstreamer/Makefile
+++ b/multimedia/py-gstreamer/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gstreamer
 PORTVERSION=	0.10.22
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia python gnome
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${FLAVOR}
 
 PORTSCOUT=	limit:0\.10\..*
 
-USES=		gmake libtool pathfix pkgconfig python:2 tar:bzip2
+USES=		gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
 USE_GNOME=	pygobject
 USE_GSTREAMER=	yes
 USE_PYTHON=	flavors
diff --git a/multimedia/py-kaa-metadata/Makefile b/multimedia/py-kaa-metadata/Makefile
index 550acfefc635..1e9918e1bbae 100644
--- a/multimedia/py-kaa-metadata/Makefile
+++ b/multimedia/py-kaa-metadata/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kaa-metadata
 PORTVERSION=	0.7.7
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/freevo/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kaa-base>0:multimedia/py-kaa-base@${FLAVOR
 		${PYTHON_PKGNAMEPREFIX}exiv2>0:graphics/py-exiv2@${FLAVOR}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 CFLAGS+=	-I${PREFIX}/include
diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index b688767253b6..4f270f7c8e66 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	totem
 PORTVERSION=	3.18.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -33,7 +33,7 @@ RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:misc/iso-codes \
 PORTSCOUT=	limitw:1,even
 
 USES=		desktop-file-utils gettext gmake gnome libtool \
-		pathfix pkgconfig python:2 tar:xz
+		pathfix pkgconfig python:2.7 tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxml2 nautilus3 \
 		pygobject3
 USE_XORG=	x11 xproto xtst ice sm
diff --git a/net-im/cjc/Makefile b/net-im/cjc/Makefile
index 580524358718..b118ef7ceecb 100644
--- a/net-im/cjc/Makefile
+++ b/net-im/cjc/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cjc
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	net-im python
 MASTER_SITES=	GHC
 
@@ -17,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=0:net-im/py-pyxmpp@${PY_FLAVOR}
 USE_GITHUB=	yes
 GH_ACCOUNT=	Jajcus
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	cjc.in cjc.py cjc/main.py
 NO_ARCH=	yes
 
diff --git a/net-im/libtelepathy/Makefile b/net-im/libtelepathy/Makefile
index 7f75c8e32089..9948278314af 100644
--- a/net-im/libtelepathy/Makefile
+++ b/net-im/libtelepathy/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Flexible Communications Framework
 LIB_DEPENDS=	libtelepathy-glib.so:net-im/telepathy-glib \
 		libdbus-glib-1.so:devel/dbus-glib
 
-USES=		gmake libtool pathfix pkgconfig python:2,build
+USES=		gmake libtool pathfix pkgconfig python:2.7,build
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 libxslt:build
 GNU_CONFIGURE=	yes
diff --git a/net-im/proxy65/Makefile b/net-im/proxy65/Makefile
index 31f7342e78b9..f7dc0b520c74 100644
--- a/net-im/proxy65/Makefile
+++ b/net-im/proxy65/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	proxy65
 PORTVERSION=	1.2.0.20150210
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 
 MAINTAINER=	mm@FreeBSD.org
@@ -28,7 +28,7 @@ JABBERD_DESC=   Use with jabberd 2.x (net-im/jabberd)
 EJABBERD_DESC=  Use with ejabberd (net-im/ejabberd)
 
 USE_PYTHON=	distutils autoplist
-USES=		python:2
+USES=		python:2.7
 USE_RC_SUBR=	proxy65
 
 PORTDOCS=	README
diff --git a/net-im/py-jabberbot/Makefile b/net-im/py-jabberbot/Makefile
index bce5c6a108d4..25a5fe918b7f 100644
--- a/net-im/py-jabberbot/Makefile
+++ b/net-im/py-jabberbot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jabberbot
 PORTVERSION=	0.16
+PORTREVISION=	1
 CATEGORIES=	net-im python
 MASTER_SITES=	SF/pythonjabberbot/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	GPLv3
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}xmpppy>0:net-im/py-xmpppy@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-patch:
diff --git a/net-im/py-libturpial/Makefile b/net-im/py-libturpial/Makefile
index c1f9079fc1de..c4e5f42b1b31 100644
--- a/net-im/py-libturpial/Makefile
+++ b/net-im/py-libturpial/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libturpial
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	net-im python
 MASTER_SITES=	http://files.turpial.org.ve/sources/stable/ \
 	CHEESESHOP
@@ -17,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}simplejson>=3.4.0:devel/py-simplejson@${FLAV
 		${PYTHON_PKGNAMEPREFIX}oauth>=1.0.1:net/py-oauth@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.2.0:www/py-requests@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-extract:
diff --git a/net-im/py-skype4py/Makefile b/net-im/py-skype4py/Makefile
index 2d8eb2f90494..5e57d07a9b44 100644
--- a/net-im/py-skype4py/Makefile
+++ b/net-im/py-skype4py/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Skype4Py
 PORTVERSION=	1.0.35
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im devel
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Skype (TM) API wrapper for Python
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net-im/telepathy-butterfly/Makefile b/net-im/telepathy-butterfly/Makefile
index 3e494aff32d2..6ef43f788c87 100644
--- a/net-im/telepathy-butterfly/Makefile
+++ b/net-im/telepathy-butterfly/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	telepathy-butterfly
 PORTVERSION=	0.5.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/papyon/__init__.py:net-im/papyon \
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${PREFIX}
-USES=		gmake python:2 shebangfix
+USES=		gmake python:2.7 shebangfix
 SHEBANG_FILES=	telepathy-butterfly
 NO_ARCH=	yes
 
diff --git a/net-im/telepathy-farsight/Makefile b/net-im/telepathy-farsight/Makefile
index 9662f6cc0e95..e35274ed083c 100644
--- a/net-im/telepathy-farsight/Makefile
+++ b/net-im/telepathy-farsight/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	telepathy-farsight
 PORTVERSION=	0.0.19
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libgstfarsight-0.10.so:net-im/farsight2
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig python:2
+USES=		gmake libtool pathfix pkgconfig python:2.7
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20 libxslt:build
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/telepathy-farstream/Makefile b/net-im/telepathy-farstream/Makefile
index d67ee7029f86..5365bc66e239 100644
--- a/net-im/telepathy-farstream/Makefile
+++ b/net-im/telepathy-farstream/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	telepathy-farstream
 PORTVERSION=	0.6.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libtelepathy-glib.so:net-im/telepathy-glib \
 		libfarstream-0.2.so:net-im/farstream
 
-USES=		gmake libtool pathfix pkgconfig python:2
+USES=		gmake libtool pathfix pkgconfig python:2.7
 USE_GNOME=	glib20 libxslt:build introspection:build
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net-im/telepathy-gabble/Makefile b/net-im/telepathy-gabble/Makefile
index fbda064c34f6..1a389f0059b6 100644
--- a/net-im/telepathy-gabble/Makefile
+++ b/net-im/telepathy-gabble/Makefile
@@ -25,7 +25,7 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		alias gmake libtool pathfix pkgconfig python:2,build \
+USES=		alias gmake libtool pathfix pkgconfig python:2.7,build \
 		shebangfix sqlite ssl
 USE_GNOME=	glib20 gtksourceview3 libxslt:build
 GNU_CONFIGURE=	yes
diff --git a/net-im/telepathy-glib/Makefile b/net-im/telepathy-glib/Makefile
index e9e88753c7cd..976fd9d6c4ed 100644
--- a/net-im/telepathy-glib/Makefile
+++ b/net-im/telepathy-glib/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	vapigen:lang/vala
 
 PORTSCOUT=	limitw:1,even
 
-USES=		gmake libtool pathfix pkgconfig python:2,build
+USES=		gmake libtool pathfix pkgconfig python:2.7,build
 USE_GNOME=	glib20 introspection:build libxslt:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/telepathy-idle/Makefile b/net-im/telepathy-idle/Makefile
index 4a92e3427519..54b108a0b9e0 100644
--- a/net-im/telepathy-idle/Makefile
+++ b/net-im/telepathy-idle/Makefile
@@ -14,7 +14,7 @@ COMMENT=	IRC Connection Manager for Telepathy Framework
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libtelepathy-glib.so:net-im/telepathy-glib
 
-USES=		gmake libtool pathfix pkgconfig python:2,build ssl
+USES=		gmake libtool pathfix pkgconfig python:2.7,build ssl
 USE_GNOME=	glib20 libxslt:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/telepathy-logger-qt4/Makefile b/net-im/telepathy-logger-qt4/Makefile
index d9b6ec3464c1..081419dc4494 100644
--- a/net-im/telepathy-logger-qt4/Makefile
+++ b/net-im/telepathy-logger-qt4/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libtelepathy-logger.so:net-im/telepathy-logger \
 		libtelepathy-qt4.so:net-im/telepathy-qt4
 
-USES=		bison:build cmake kde:4 pkgconfig python:2,build tar:bzip2
+USES=		bison:build cmake kde:4 pkgconfig python:2.7,build tar:bzip2
 USE_GNOME=	glib20 libxml2
 USE_GSTREAMER=	qt4
 USE_KDE=	# empty
diff --git a/net-im/telepathy-logger/Makefile b/net-im/telepathy-logger/Makefile
index 030fd7ce2668..627dacac93e5 100644
--- a/net-im/telepathy-logger/Makefile
+++ b/net-im/telepathy-logger/Makefile
@@ -16,7 +16,7 @@ LICENSE=	LGPL21
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libtelepathy-glib.so:net-im/telepathy-glib
 
-USES=		gettext-tools gmake libtool pathfix pkgconfig python:2,build \
+USES=		gettext-tools gmake libtool pathfix pkgconfig python:2.7,build \
 		sqlite tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
diff --git a/net-im/telepathy-python/Makefile b/net-im/telepathy-python/Makefile
index 336b70f447c7..715abe3b40bd 100644
--- a/net-im/telepathy-python/Makefile
+++ b/net-im/telepathy-python/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	telepathy-python
 PORTVERSION=	0.15.19
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/${PORTNAME}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	Python bindings for the Telepathy framework
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 
-USES=		gmake python:2
+USES=		gmake python:2.7
 USE_GNOME=	libxslt:build
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/net-im/telepathy-qt4/Makefile b/net-im/telepathy-qt4/Makefile
index a841631027e4..84e4a2657364 100644
--- a/net-im/telepathy-qt4/Makefile
+++ b/net-im/telepathy-qt4/Makefile
@@ -22,7 +22,7 @@ OPTIONS_DEFINE=	DOCS
 
 USE_GNOME=	glib20 libxslt:build
 USE_GSTREAMER=	yes
-USES=		cmake:outsource gettext pathfix pkgconfig python:2,build
+USES=		cmake:outsource gettext pathfix pkgconfig python:2.7,build
 CMAKE_ARGS=	-DENABLE_EXAMPLES:BOOL=False \
 		-DENABLE_FARSIGHT:BOOL=False \
 		-DENABLE_FARSTREAM:BOOL=True \
diff --git a/net-im/telepathy-rakia/Makefile b/net-im/telepathy-rakia/Makefile
index 56cf930964e7..ac4c25d531b0 100644
--- a/net-im/telepathy-rakia/Makefile
+++ b/net-im/telepathy-rakia/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 		libsofia-sip-ua-glib.so:net/sofia-sip \
 		libtelepathy-glib.so:net-im/telepathy-glib
 
-USES=		gmake pathfix pkgconfig python:2,build ssl
+USES=		gmake pathfix pkgconfig python:2.7,build ssl
 USE_GNOME=	glib20 libxslt:build
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
diff --git a/net-im/telepathy-salut/Makefile b/net-im/telepathy-salut/Makefile
index ee45c4963a2a..d4f5e5189d0d 100644
--- a/net-im/telepathy-salut/Makefile
+++ b/net-im/telepathy-salut/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libavahi-glib.so:net/avahi-app \
 		libsoup-2.4.so:devel/libsoup
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig python:2,build sqlite ssl
+USES=		gmake libtool pathfix pkgconfig python:2.7,build sqlite ssl
 USE_GNOME=	glib20 libxslt:build
 CONFIGURE_ARGS=	--disable-Werror --enable-avahi-tests=no
 LDFLAGS+=	-lpthread
diff --git a/net-im/turpial/Makefile b/net-im/turpial/Makefile
index 5dabdce36ccc..b61e0f02ba49 100644
--- a/net-im/turpial/Makefile
+++ b/net-im/turpial/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	turpial
 PORTVERSION=	3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im python
 MASTER_SITES=	http://files.turpial.org.ve/sources/stable/
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${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
+USES=		pyqt:4 python:2.7
 USE_PYQT=	core_run gui_run network_run phonon_run webkit_run
 USE_PYTHON=	distutils autoplist
 INSTALLS_ICONS=	yes
diff --git a/net-mgmt/crmsh/Makefile b/net-mgmt/crmsh/Makefile
index 3248b69a5286..1da94eb9e7a0 100644
--- a/net-mgmt/crmsh/Makefile
+++ b/net-mgmt/crmsh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	crmsh
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	net-mgmt python
 
 MAINTAINER=	dpejesh@yahoo.com
@@ -21,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
 USE_GITHUB=	yes
 GH_ACCOUNT=	ClusterLabs
 
-USES=		autoreconf gmake python:2 shebangfix
+USES=		autoreconf gmake python:2.7 shebangfix
 USE_PYTHON=	flavors
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ocf-root=${PREFIX}/lib/ocf
diff --git a/net-mgmt/librenms-agent/Makefile b/net-mgmt/librenms-agent/Makefile
index 8978895b8971..0ca8b8411e6f 100644
--- a/net-mgmt/librenms-agent/Makefile
+++ b/net-mgmt/librenms-agent/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	librenms-agent
 PORTVERSION=	0.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	kiwi@oav.net
@@ -10,7 +11,7 @@ COMMENT=	Agents and plugins for librenms
 
 LICENSE=	GPLv2
 
-USES=		shebangfix python:2:run php:cli
+USES=		shebangfix python:2.7:run php:cli
 NO_ARCH=	yes
 
 USE_GITHUB=	yes
diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index 8eea9b4e6142..81a844ab6421 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	nagstamon
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-mgmt python
 MASTER_SITES=	https://nagstamon.ifw-dresden.de/files/very_stable/ \
 		LOCAL/ehaupt
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	sox:audio/sox \
 		${PYTHON_PKGNAMEPREFIX}keyring>=1.3:security/py-keyring@${FLAVOR}
 
-USES=		cpe python:2
+USES=		cpe python:2.7
 CPE_VENDOR=	henri_wahl
 USE_PYTHON=	distutils
 USE_GNOME=	pygtk2 librsvg2
diff --git a/net-mgmt/tornova/Makefile b/net-mgmt/tornova/Makefile
index 18534dbfc37b..7875b4f17932 100644
--- a/net-mgmt/tornova/Makefile
+++ b/net-mgmt/tornova/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	tornova
 PORTVERSION=	0.2.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	net-mgmt
 
@@ -18,7 +19,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	neelchauhan
 GH_PROJECT=	TorNova
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 USE_GNOME=	gtk30 pygobject3
 NO_ARCH=	yes
diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 7ceb72d7304e..d2063d634401 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tribler
 PORTVERSION=	6.5.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/Tribler/tribler/releases/download/v${PORTVERSION}/
 DISTNAME=	Tribler-v${PORTVERSION}
@@ -34,7 +34,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw@${PY_FLAVOR} \
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
-USES=		desktop-file-utils python:2,run ssl:run tar:xz
+USES=		desktop-file-utils python:2.7,run ssl:run tar:xz
 USE_WX=		2.8
 WX_COMPS=	python
 INSTALLS_ICONS=	yes
diff --git a/net/googlecl/Makefile b/net/googlecl/Makefile
index e3a396be242c..6de572d5fedc 100644
--- a/net/googlecl/Makefile
+++ b/net/googlecl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	googlecl
 PORTVERSION=	0.9.15.1
+PORTREVISION=	1
 CATEGORIES=	net www python
 
 MAINTAINER=	sbz@FreeBSD.org
@@ -15,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}oauth2client>0:security/py-oauth2client@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	vinitkumar
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index ecd1553b9649..f01c1b00908b 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	3.1.11
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF
@@ -62,7 +62,7 @@ LDAP_CFLAGS=		-I${LOCALBASE}/include -L${LOCALBASE}/lib
 LDAP_USE=	OPENLDAP=yes
 LDAP_CONFIGURE_OFF=	--without-ldap
 SENDFILE_CONFIGURE_ENABLE=sendfile
-DBUS_USES=	python:2
+DBUS_USES=	python:2.7
 DBUS_USE=	GNOME=glib20
 DBUS_LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib \
 			libdbus-1.so:devel/dbus
diff --git a/net/neubot/Makefile b/net/neubot/Makefile
index 62628bf9790b..415b3cafe21b 100644
--- a/net/neubot/Makefile
+++ b/net/neubot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	neubot
 PORTVERSION=	0.4.16.9
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://releases.neubot.org/_packages/
 
@@ -13,7 +14,7 @@ LICENSE=	GPLv3
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 NO_BUILD=	yes
 
 USERS=		_neubot
diff --git a/net/nsscache/Makefile b/net/nsscache/Makefile
index f57ec43fbce2..635c73d4a4d0 100644
--- a/net/nsscache/Makefile
+++ b/net/nsscache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nsscache
 PORTVERSION=	0.32
+PORTREVISION=	1
 DISTVERSIONPREFIX=	version/
 CATEGORIES=	net python
 
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pycurl.so:ftp/py-pycurl@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ldap>0:net/py-ldap@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
diff --git a/net/py-avahi/Makefile b/net/py-avahi/Makefile
index 18d9d62e9cf3..d98232b30752 100644
--- a/net/py-avahi/Makefile
+++ b/net/py-avahi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 #   $MCom: ports/net/py-avahi/Makefile,v 1.4 2007/07/31 18:24:13 ahze Exp $
 
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	# empty
@@ -25,7 +25,7 @@ PLIST=		${.CURDIR}/pkg-plist
 AVAHI_SLAVE=	python
 
 USE_GNOME=	pygtk2
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	flavors
 MANPAGES=	avahi-bookmarks.1 avahi-discover.1
 
diff --git a/net/py-gntp/Makefile b/net/py-gntp/Makefile
index eb553e4059f2..4995c0c94e39 100644
--- a/net/py-gntp/Makefile
+++ b/net/py-gntp/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	gntp
 PORTVERSION=	0.8
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -17,7 +17,7 @@ GH_ACCOUNT=	kfdm
 OPTIONS_DEFINE=	DOCS
 
 USE_GITHUB=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.pre.mk>
diff --git a/net/py-gspread/Makefile b/net/py-gspread/Makefile
index 1dd8a114c204..ab0781f6f88b 100644
--- a/net/py-gspread/Makefile
+++ b/net/py-gspread/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gspread
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>2.2.1:www/py-requests@${FLAVOR}
 
-USES=	python:2
+USES=	python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/net/py-gspreadsheet/Makefile b/net/py-gspreadsheet/Makefile
index b1f55a61bd0c..90e4ff4c5b5d 100644
--- a/net/py-gspreadsheet/Makefile
+++ b/net/py-gspreadsheet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gspreadsheet
 PORTVERSION=	0.4.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gdata>0:devel/py-gdata@${FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${FLAVOR}
 
-USES=	python:2
+USES=	python:2.7
 USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	README.rst
diff --git a/net/py-python-ntlm/Makefile b/net/py-python-ntlm/Makefile
index b19f51a5b7c4..abf577468e49 100644
--- a/net/py-python-ntlm/Makefile
+++ b/net/py-python-ntlm/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	python-ntlm
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	Python library that provides NTLM support
 
 NO_ARCH=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/net/py-raet/Makefile b/net/py-raet/Makefile
index a239ea7af10a..dd399f9548c4 100644
--- a/net/py-raet/Makefile
+++ b/net/py-raet/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	raet
 PORTVERSION=	0.6.5
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Reliable Asynchronous Event Transport protocol library
 
 LICENSE=	APACHE20
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index 3bd95ad5f031..dadc8869ac21 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	s3cmd
 DISTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	SF/s3tools/${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
diff --git a/net/py-soappy/Makefile b/net/py-soappy/Makefile
index c9bb3b285c5f..77f0019432ec 100644
--- a/net/py-soappy/Makefile
+++ b/net/py-soappy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	soappy
 PORTVERSION=	0.12.22
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LICENSE=	BSD3CLAUSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wstools>0:textproc/py-wstools@${FLAVOR}
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	autoplist distutils
 
 CONFLICTS=	py*-soappy-devel-0.12.*
diff --git a/net/py-suds/Makefile b/net/py-suds/Makefile
index b67f3b3f012b..850d3f0e3fd6 100644
--- a/net/py-suds/Makefile
+++ b/net/py-suds/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	suds
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ LICENSE=	LGPL3
 
 CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}suds-jurko-*
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/net/py-wolframalpha/Makefile b/net/py-wolframalpha/Makefile
index 0f57db921b22..0cb65a4ea3f8 100644
--- a/net/py-wolframalpha/Makefile
+++ b/net/py-wolframalpha/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	wolframalpha
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hgtools>0:devel/py-hgtools@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-runner>0:devel/py-pytest-runner@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4:devel/py-six@${FLAVOR}
 
-USES=	python:2 zip
+USES=	python:2.7 zip
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index 62fa0a1c8ea7..b7452a539bdc 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zsi
 DISTVERSION=	2.1-a1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net python
 MASTER_SITES=	SF/pywebsvcs/ZSI/ZSI-${DISTVERSION:S,-,_,}
@@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME:tu}-${DISTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Pure Python implementation of SOAP 1.1
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 SHEBANG_FILES=	doc/examples/*/*/*/*/*.py \
diff --git a/net/samba44/Makefile b/net/samba44/Makefile
index 70438c60e8d6..3b8fc8617dd1 100644
--- a/net/samba44/Makefile
+++ b/net/samba44/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}44
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		0
+PORTREVISION?=		1
 CATEGORIES?=		net
 MASTER_SITES=		SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=		${SAMBA4_DISTNAME}
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--mandir="${MANPREFIX}/man" \
 # Flags
 CONFIGURE_ENV+=		PTHREAD_LDFLAGS="-lpthread"
 
-USES=			cpe compiler waf pkgconfig perl5 python:2 \
+USES=			cpe compiler waf pkgconfig perl5 python:2.7 \
 			readline iconv shebangfix
 USE_PERL5=		build
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
diff --git a/net/samba45/Makefile b/net/samba45/Makefile
index 5dbd244ed5be..7473bac31820 100644
--- a/net/samba45/Makefile
+++ b/net/samba45/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME?=			${SAMBA4_BASENAME}45
 PORTVERSION?=			${SAMBA4_VERSION}
-PORTREVISION?=			0
+PORTREVISION?=			1
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=		--mandir="${MANPREFIX}/man" \
 # Flags
 CONFIGURE_ENV+=			PTHREAD_LDFLAGS="-lpthread"
 
-USES=				cpe compiler waf pkgconfig perl5 python:2 \
+USES=				cpe compiler waf pkgconfig perl5 python:2.7 \
 				readline iconv shebangfix
 USE_PERL5=			build
 USE_LDCONFIG=			${SAMBA4_LIBDIR}
diff --git a/net/spideroak/Makefile b/net/spideroak/Makefile
index 1aefbca5d92e..65aa223453ac 100644
--- a/net/spideroak/Makefile
+++ b/net/spideroak/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	spideroak
 PORTVERSION=	6.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://nivit.altervista.org/FreeBSD/ports/distfiles/${PORTNAME}/ \
 		https://spideroak.com/getbuild?platform=slackware&arch=i386&dummy=/
@@ -32,7 +32,7 @@ PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,} \
 SUB_LIST=	LINUXBASE=${LINUXBASE}
 SUB_FILES=	pkg-message
 
-USES=		desktop-file-utils linux python:2 tar:tgz
+USES=		desktop-file-utils linux python:2.7 tar:tgz
 USE_LINUX=	xorglibs
 
 post-patch:
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index c68068c7351f..1ed631a9f7eb 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libpcap.so.1:net/libpcap	# avoid base libpcap
 
-USES=		ncurses scons shebangfix ssl compiler:env python:2,build
+USES=		ncurses scons shebangfix ssl compiler:env python:2.7,build
 USE_GITHUB=	yes
 USE_RC_SUBR=	xorp
 GH_ACCOUNT=	greearb
diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index f3c65ef2fd03..c17f62b78216 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hellanzb
 PORTVERSION=	0.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	news
 MASTER_SITES=	http://www.hellanzb.com/distfiles/
 
@@ -20,7 +20,7 @@ RUN_DEPENDS=	par2:archivers/par2cmdline \
 		mac:audio/mac
 
 USE_PYTHON=	distutils
-USES=		python:2
+USES=		python:2.7
 PORTDOCS=	CHANGELOG CREDITS README
 NO_ARCH=	yes
 
diff --git a/news/xpn/Makefile b/news/xpn/Makefile
index 6ad91e8fdfb8..67b76550cdd1 100644
--- a/news/xpn/Makefile
+++ b/news/xpn/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xpn
 PORTVERSION=	1.2.6
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	news python
 MASTER_SITES=	http://xpn.altervista.org/codice/
 
@@ -21,7 +21,7 @@ SHEBANG_FILES=	${XPN}
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} XPN=${XPN}
 
-USES=		gettext python:2 shebangfix
+USES=		gettext python:2.7 shebangfix
 
 XPN=	${PORTNAME}.py
 
diff --git a/print/lyx/Makefile b/print/lyx/Makefile
index 6084a28f11c5..2c5731a143ec 100644
--- a/print/lyx/Makefile
+++ b/print/lyx/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	lyx
 PORTVERSION=	${MAJOR_VERSION}.${MINOR_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print editors
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \
 		http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \
@@ -22,7 +22,7 @@ MAJOR_VERSION=	2.2
 MINOR_VERSION=	3
 
 USES=		desktop-file-utils gmake iconv pkgconfig perl5 \
-		python:2 shebangfix tar:xz
+		python:2.7 shebangfix tar:xz
 USE_QT5=	core concurrent gui svg widgets buildtools_build qmake_build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-boost \
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index 27a4f25e9534..18ae03fd2b2c 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	system-config-printer
 PORTVERSION=	1.4.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	print gnome
 MASTER_SITES=	http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/
 
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycups>=0:print/py-pycups@${PY_FLAVOR} \
 PORTSCOUT=	limitw:1,even
 
 GNU_CONFIGURE=	yes
-USES=		desktop-file-utils gettext gmake pathfix pkgconfig python:2 \
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig python:2.7 \
 		shebangfix tar:xz
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/science/avogadro/Makefile b/science/avogadro/Makefile
index 9934c6533334..ea832669c269 100644
--- a/science/avogadro/Makefile
+++ b/science/avogadro/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	avogadro
 PORTVERSION=	1.1.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	science
 MASTER_SITES=	SF
 
@@ -34,7 +34,7 @@ OPTIONS_DEFINE=	PYTHON
 OPTIONS_DEFAULT=PYTHON
 OPTIONS_SUB=	yes
 
-PYTHON_USES=		python:2
+PYTHON_USES=		python:2.7
 PYTHON_BUILD_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}sip>0:devel/py-sip@${PY_FLAVOR}
 PYTHON_LIB_DEPENDS=	${PY_BOOST}
diff --git a/science/py-coards/Makefile b/science/py-coards/Makefile
index cf2b3309e0c1..15d43146e8aa 100644
--- a/science/py-coards/Makefile
+++ b/science/py-coards/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	coards
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	COARDS compliant time parser
 
 LICENSE=	MIT
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/science/py-pupynere/Makefile b/science/py-pupynere/Makefile
index e18dd8990573..090f52c4a81e 100644
--- a/science/py-pupynere/Makefile
+++ b/science/py-pupynere/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pupynere
 PORTVERSION=	1.0.15
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	MIT
 BUILD_DEPENDS=	${PYNUMPY}
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/science/py-pyaixi/Makefile b/science/py-pyaixi/Makefile
index 092292a7b2eb..34591f8fd7e4 100644
--- a/science/py-pyaixi/Makefile
+++ b/science/py-pyaixi/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pyaixi
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Implementation of the MC-AIXI-CTW AI algorithm
 LICENSE=	CC-BY-SA-3.0
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		dos2unix python:2
+USES=		dos2unix python:2.7
 USE_PYTHON=	distutils autoplist
 
 PORTDOCS=	changelog.txt \
diff --git a/science/py-ws2300/Makefile b/science/py-ws2300/Makefile
index abac19febc46..9c11633ee666 100644
--- a/science/py-ws2300/Makefile
+++ b/science/py-ws2300/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ws2300
 PORTVERSION=	1.10
+PORTREVISION=	1
 CATEGORIES=	science python
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}-1
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Driver for the LaCrosse WS-2300 weather station
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/agpl-3.0.txt
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/science/silo/Makefile b/science/silo/Makefile
index 4c8bdc4caab7..afcb57c34887 100644
--- a/science/silo/Makefile
+++ b/science/silo/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	silo
 PORTVERSION=	4.10.2
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONSUFFIX=	-bsd
 CATEGORIES=	science
 MASTER_SITES=	http://wci.llnl.gov/content/assets/docs/simulation/computer-codes/${PORTNAME}/silo-${PORTVERSION}/
@@ -33,7 +33,7 @@ HDF5_PLIST_SUB=			SUFX_HDF5="h5"
 HDF5_PLIST_SUB_OFF=		SUFX_HDF5=""
 
 PYTHON_CONFIGURE_ENABLE=	pythonmodule
-PYTHON_USES=			python:2
+PYTHON_USES=			python:2.7
 
 QT4_USE=			XORG=ice,sm,x11,xext,xi,xmu,xt \
 				QT4=corelib,gui,linguisttools_build,moc_build,uic_build
diff --git a/security/cfv/Makefile b/security/cfv/Makefile
index 105c79cade84..34a40438bc1a 100644
--- a/security/cfv/Makefile
+++ b/security/cfv/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	cfv
 PORTVERSION=	1.18.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	SF
 
 MAINTAINER=	rezny@FreeBSD.org
 COMMENT=	Utility to both test and create .sfv, .csv, and md5sum files
 
-USES=		python:2
+USES=		python:2.7
 ALL_TARGET=	cfv.wrapper
 INSTALL_TARGET=	install-wrapper
 MAKE_ARGS=	PYTHON=${PYTHON_CMD}
diff --git a/security/denyhosts/Makefile b/security/denyhosts/Makefile
index 446d232b9f95..40055bc5af44 100644
--- a/security/denyhosts/Makefile
+++ b/security/denyhosts/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	denyhosts
 PORTVERSION=	2.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security
 MASTER_SITES=	SF
 DISTNAME=	DenyHosts-${PORTVERSION}
@@ -18,7 +18,7 @@ OPTIONS_DEFINE=	DOCS
 REINPLACE_ARGS=	-i ''
 USE_PYTHON=	autoplist distutils
 USE_RC_SUBR=	denyhosts
-USES=		cpe python:2 shebangfix
+USES=		cpe python:2.7 shebangfix
 CPE_VENDOR=	phil_schwartz
 
 PORTDOCS=	CHANGELOG.txt LICENSE.txt README.txt
diff --git a/security/py-PF/Makefile b/security/py-PF/Makefile
index d4a2edc03f23..73115d091297 100644
--- a/security/py-PF/Makefile
+++ b/security/py-PF/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	PF
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,7 +13,7 @@ COMMENT=	Pure-Python module for managing OpenBSD Packet Filter
 LICENSE=	BSD3CLAUSE
 
 USE_GITHUB=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 GH_ACCOUNT=	dotpy
diff --git a/security/py-cryptlib_py/Makefile b/security/py-cryptlib_py/Makefile
index b4a636ffe5d7..c0f567b7abdf 100644
--- a/security/py-cryptlib_py/Makefile
+++ b/security/py-cryptlib_py/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cryptlib_py
 PORTVERSION=	3.4.3
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.franken.de/pub/crypt/cryptlib/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 ONLY_FOR_ARCHS=	i386 amd64 armv6 armv7
 
-USES=		python:2 zip:infozip
+USES=		python:2.7 zip:infozip
 USE_PYTHON=	distutils autoplist
 
 LIB_DEPENDS+=	libcl.so:security/cryptlib
diff --git a/security/py-keyczar/Makefile b/security/py-keyczar/Makefile
index fc45226783fa..17fcff1906cf 100644
--- a/security/py-keyczar/Makefile
+++ b/security/py-keyczar/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	keyczar
 PORTVERSION=	0.716
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycrypto>=2.0:security/py-pycrypto@${FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1@${FLAVOR}
 
 NO_ARCH=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/security/py-onetime/Makefile b/security/py-onetime/Makefile
index af73da8942a3..51c7dd04d620 100644
--- a/security/py-onetime/Makefile
+++ b/security/py-onetime/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	onetime
 PORTVERSION=	1.81
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.red-bean.com/onetime/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Encryption program that uses the one-time pad algorithm
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	onetime
 
 NO_ARCH=	yes
diff --git a/security/py-pydeep/Makefile b/security/py-pydeep/Makefile
index 3f3ccc0aa1a0..712280c73622 100644
--- a/security/py-pydeep/Makefile
+++ b/security/py-pydeep/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pydeep
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	security devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libfuzzy.so:security/ssdeep
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 post-patch:
diff --git a/security/py-requests-kerberos/Makefile b/security/py-requests-kerberos/Makefile
index 567ff18ca198..c3c111012128 100644
--- a/security/py-requests-kerberos/Makefile
+++ b/security/py-requests-kerberos/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	requests-kerberos
 PORTVERSION=	0.11.0
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>1.1.0:www/py-requests@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}kerberos>1.1.1:security/py-kerberos@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/security/py-slowaes/Makefile b/security/py-slowaes/Makefile
index 63d1c0e5d262..7c93ce9bbe40 100644
--- a/security/py-slowaes/Makefile
+++ b/security/py-slowaes/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	slowaes
 DISTVERSION=	0.1a1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Implementation of AES in pure Python
 
 LICENSE=	APACHE20
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/security/py-tlslite/Makefile b/security/py-tlslite/Makefile
index 43e38bef234f..e2e452d24e78 100644
--- a/security/py-tlslite/Makefile
+++ b/security/py-tlslite/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tlslite
 PORTVERSION=	0.4.9
+PORTREVISION=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module implementing SSL 3.0, TLS 1.0, and TLS 1.1
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/security/py-twofish/Makefile b/security/py-twofish/Makefile
index ea0d2fc45357..16a3cb737376 100644
--- a/security/py-twofish/Makefile
+++ b/security/py-twofish/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	twofish
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security python
 MASTER_SITES=	SF/${PORTNAME}-py/${PORTNAME}-py/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +12,7 @@ DISTNAME=	twofishmodule-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Twofish cryptographic module for Python
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	cryptfile.py decryptfile.py
 GNU_CONFIGURE=	yes
 CFLAGS+=	-fPIC
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index b3740cfa882b..82005df11046 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sssd
 PORTVERSION=	1.11.7
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security
 MASTER_SITES=	https://releases.pagure.org/SSSD/${PORTNAME}/
 
@@ -53,11 +53,11 @@ SUB_FILES=	pkg-message
 USE_LDCONFIG=	yes
 USE_OPENLDAP=	yes
 USES=		autoreconf cpe gettext gmake iconv libtool pathfix pkgconfig \
-		python:2 shebangfix gssapi:mit
+		python:2.7 shebangfix gssapi:mit
 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	fedoraproject
 
-python_CMD=	${SETENV} python2
+python_CMD=	${SETENV} ${PYTHON_VERSION}
 SHEBANG_FILES=	src/tools/sss_obfuscate \
 		src/sbus/sbus_codegen
 
diff --git a/security/w3af/Makefile b/security/w3af/Makefile
index ca9d0e37d1e1..0a13e4ae6635 100644
--- a/security/w3af/Makefile
+++ b/security/w3af/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>=2.1:devel/py-lxml@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stopit>=1.1.0:devel/py-stopit@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}chardet>=2.1.1:textproc/py-chardet@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}tblib>=0.2.0:devel/py-tblib@${FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pdfminer=20140328:textproc/py-pdfminer@${FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pdfminer>=20140328:textproc/py-pdfminer@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}futures>=2.1.5:devel/py-futures@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>=0.3.3:net/py-ndg_httpsclient@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.3:devel/py-pyasn1@${FLAVOR} \
diff --git a/shells/jailkit/Makefile b/shells/jailkit/Makefile
index 26adb545cd93..45b3a82e3ad9 100644
--- a/shells/jailkit/Makefile
+++ b/shells/jailkit/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	jailkit
 PORTVERSION=	2.19
+PORTREVISION=	1
 CATEGORIES=	shells
 MASTER_SITES=	http://olivier.sessink.nl/jailkit/ \
 		http://www.sfr-fresh.com/unix/privat/
@@ -12,7 +13,7 @@ COMMENT=	Utilities to limit user accounts to specific files and/or commands
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2
+USES=		python:2.7
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHONINTERPRETER=${PYTHON_CMD}
 
diff --git a/sysutils/ansible1/Makefile b/sysutils/ansible1/Makefile
index 08b15b6b077a..e1fbf91e2469 100644
--- a/sysutils/ansible1/Makefile
+++ b/sysutils/ansible1/Makefile
@@ -3,7 +3,7 @@
 
 PKGNAMESUFFIX=	1
 PORTVERSION=	1.9.6
-PORTREVISION=	1
+PORTREVISION=	2
 
 CONFLICTS=	ansible-* ansible23-*
 
@@ -15,7 +15,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR}
 
-USES=	cpe python:2 shebangfix
+USES=	cpe python:2.7 shebangfix
 
 PLIST_FILES=	man/man1/ansible-doc.1.gz \
 		man/man1/ansible-galaxy.1.gz \
diff --git a/sysutils/bamf/Makefile b/sysutils/bamf/Makefile
index 908a95c7c53b..4a9ce508fbcf 100644
--- a/sysutils/bamf/Makefile
+++ b/sysutils/bamf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bamf
 PORTVERSION=	0.5.3
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://launchpadlibrarian.net/280921055/ \
 	https://launchpad.net/${PORTNAME}/${PORTVERSION:R}/${PORTVERSION}/+download/
@@ -20,7 +21,7 @@ LIB_DEPENDS=	libgtop-2.0.so:devel/libgtop \
 	libdbus-glib-1.so:devel/dbus-glib \
 	libstartup-notification-1.so:x11/startup-notification
 
-USES=		gettext-runtime gmake libtool pathfix pkgconfig python:2
+USES=		gettext-runtime gmake libtool pathfix pkgconfig python:2.7
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk30 glib20 introspection:build libwnck3 cairo gdkpixbuf2
 USE_XORG=	x11
diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile
index c088694bc1dc..cfb757de39a2 100644
--- a/sysutils/cinnamon-control-center/Makefile
+++ b/sysutils/cinnamon-control-center/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cinnamon-control-center
 PORTVERSION=	2.4.2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/9363a4a1e121344ae98f22b55fb28623cf0f6038/panels/datetime/data/:tzpng
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@@ -39,7 +39,7 @@ RUN_DEPENDS=	py*-dbus>=0:devel/py-dbus \
 		py*-lxml>=0:devel/py-lxml
 
 USES=		autoreconf gettext gmake libtool pathfix \
-		python:2 pkgconfig
+		python:2.7 pkgconfig
 USE_GNOME=	evolutiondataserver3 gconf2 gnomeprefix \
 		gtk30 intlhack libgnomekbd
 USE_GITHUB=	yes
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
index 326b4d997566..0015fc7b54fc 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	condor
 PORTVERSION=	8.4.9
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.acadix.biz/Ports/distfiles/
 DISTNAME=	condor_src-${PORTVERSION}-all-all
@@ -26,7 +26,7 @@ LIB_DEPENDS+=	libkrb5support.so:security/krb5 \
 WRKSRC=		${WRKDIR}/condor-${PORTVERSION}
 USE_LDCONFIG=	yes
 # Does not build with Python 3
-USES=		cmake cpe perl5 pgsql python:2 shebangfix ssl
+USES=		cmake cpe perl5 pgsql python:2.7 shebangfix ssl
 CPE_VENDOR=	condor_project
 SHEBANG_FILES=	src/condor_scripts/condor_qsub \
 		src/condor_gridmanager/remote_gahp \
diff --git a/sysutils/feather/Makefile b/sysutils/feather/Makefile
index 9739d2adeb21..5d13d4ea8483 100644
--- a/sysutils/feather/Makefile
+++ b/sysutils/feather/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	feather
 PORTVERSION=	1.3.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,7 +16,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 USE_GITHUB=	yes
 GH_ACCOUNT=	danrue
 
-USES=		python:2,run shebangfix
+USES=		python:2.7,run shebangfix
 SHEBANG_FILES=	${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/sysutils/hatop/Makefile b/sysutils/hatop/Makefile
index cc6f2366532c..355a91296b47 100644
--- a/sysutils/hatop/Makefile
+++ b/sysutils/hatop/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	hatop
 PORTVERSION=	0.7.7
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils net
 
@@ -13,7 +14,7 @@ LICENSE=	GPLv3+
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/haproxy:net/haproxy
 
-USES=		python:2
+USES=		python:2.7
 NO_BUILD=	yes
 
 USE_GITHUB=	yes
diff --git a/sysutils/py-XenAPI/Makefile b/sysutils/py-XenAPI/Makefile
index 8c2d275b007a..7099845a0d86 100644
--- a/sysutils/py-XenAPI/Makefile
+++ b/sysutils/py-XenAPI/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	XenAPI
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://community.citrix.com/download/attachments/38633496/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ EXTRACT_ONLY=
 MAINTAINER=	bsdports@wayfair.com
 COMMENT=	Xen API Library for Python
 
-USES=		python:2
+USES=		python:2.7
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/XenAPI.py \
 		%%PYTHON_SITELIBDIR%%/XenAPI.pyc \
diff --git a/sysutils/py-halite/Makefile b/sysutils/py-halite/Makefile
index e27a68511dc4..4b456ab573e8 100644
--- a/sysutils/py-halite/Makefile
+++ b/sysutils/py-halite/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	halite
 PORTVERSION=	0.1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	APACHE20
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}salt>=0.17.0:sysutils/py-salt@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}cherrypy>0:www/py-cherrypy@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-pywatchman/Makefile b/sysutils/py-pywatchman/Makefile
index e19d57c1d381..3cc7e4618da7 100644
--- a/sysutils/py-pywatchman/Makefile
+++ b/sysutils/py-pywatchman/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pywatchman
 PORTVERSION=	1.3.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	watchman>=4:sysutils/watchman
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 post-install:
diff --git a/sysutils/py-zfs/Makefile b/sysutils/py-zfs/Makefile
index 8649e20532ae..3ff597baee20 100644
--- a/sysutils/py-zfs/Makefile
+++ b/sysutils/py-zfs/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	zfs
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT=	Python ZFS library
 LICENSE=	CDDL
 LICENSE_FILE=	${WRKSRC}/OPENSOLARIS.LICENSE
 
-USES=		python:2
+USES=		python:2.7
 MAKEFILE=	${FILESDIR}/Makefile.lib
 MAKE_ARGS+=	PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \
 		PYTHON_LDFLAGS="-L${LOCALBASE}/lib -l${PYTHON_VERSION}"
diff --git a/sysutils/zeitgeist/Makefile b/sysutils/zeitgeist/Makefile
index 7a4ce54d6b5c..885d7536c4bf 100644
--- a/sysutils/zeitgeist/Makefile
+++ b/sysutils/zeitgeist/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	zeitgeist
 PORTVERSION=	0.9.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	https://launchpad.net/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/${PORTVERSION}/+download/
 
@@ -21,7 +21,7 @@ BUILD_DEPENDS=	valac:lang/vala \
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/__init__.py:devel/py-xdg@${PY_FLAVOR} \
 		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus@${PY_FLAVOR}
 
-USES=		gmake gettext pathfix python:2 pkgconfig libtool sqlite tar:xz
+USES=		gmake gettext pathfix python:2.7 pkgconfig libtool sqlite tar:xz
 USE_GNOME=	intlhack glib20 introspection:build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/archmage/Makefile b/textproc/archmage/Makefile
index 8924701af090..4bd22391a1e0 100644
--- a/textproc/archmage/Makefile
+++ b/textproc/archmage/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	archmage
 PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/chm/chm.py:textproc/pychm \
 		${PYTHON_SITELIBDIR}/BeautifulSoup.py:www/py-beautifulsoup32@${FLAVOR}
 
 NO_BUILD=	yes
-USES=		cpe python:2 tar:bzip2
+USES=		cpe python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 
 CPE_VENDOR=	archmage_project
diff --git a/textproc/dblatex/Makefile b/textproc/dblatex/Makefile
index 59ef0fb28880..6f2078e2f570 100644
--- a/textproc/dblatex/Makefile
+++ b/textproc/dblatex/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dblatex
 PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	${LOCALBASE}/share/texmf-dist/tex/generic/ifxetex/ifxetex.sty:pri
 RUN_DEPENDS=	xsltproc:textproc/libxslt \
 		docbook-xml>0:textproc/docbook-xml
 
-USES=		tar:bzip2 python:2
+USES=		tar:bzip2 python:2.7
 USE_PYTHON=	distutils autoplist
 USE_TEX=	dvipsk:run tex
 NO_ARCH=	yes
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 4ba5055e0c4a..943de1703a3f 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome-doc-utils
 PORTVERSION=	0.20.10
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc gnome
 MASTER_SITES=	GNOME
 
@@ -17,7 +17,7 @@ RUN_DEPENDS=	rarian-sk-config:textproc/rarian \
 		${PYTHON_SITELIBDIR}/libxml2mod.so:textproc/py-libxml2@${PY_FLAVOR} \
 		docbook-xml>0:textproc/docbook-xml
 
-USES=		gettext-tools:build,run gmake pathfix pkgconfig python:2 tar:xz
+USES=		gettext-tools:build,run gmake pathfix pkgconfig python:2.7 tar:xz
 USE_GNOME=	libxslt intlhack
 INSTALLS_OMF=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/ibus/Makefile b/textproc/ibus/Makefile
index 0c8eff32e952..9d69af4bac27 100644
--- a/textproc/ibus/Makefile
+++ b/textproc/ibus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ibus
 DISTVERSION=	1.5.17
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${PORTVERSION}/:DEFAULT
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:DEFAULT
@@ -21,7 +22,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.83.0:devel/py-dbus@${PY_FLAVOR} \
 		${LOCALBASE}/share/xml/iso-codes/iso_639.xml:misc/iso-codes \
 		setxkbmap:x11/setxkbmap
 
-USES=		compiler cpe gmake libtool localbase pathfix pkgconfig python:2
+USES=		compiler cpe gmake libtool localbase pathfix pkgconfig python:2.7
 USE_GNOME=	glib20 intltool librsvg2 pygobject3
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/textproc/itstool/Makefile b/textproc/itstool/Makefile
index cac9fcda5fe2..a60c1eeb71b9 100644
--- a/textproc/itstool/Makefile
+++ b/textproc/itstool/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	itstool
 PORTVERSION=	2.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://files.itstool.org/itstool/
 
@@ -16,7 +16,7 @@ LICENSE=	GPLv3
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/libxml2.py:textproc/py-libxml2@${PY_FLAVOR}
 
-USES=		python:2,run tar:bzip2
+USES=		python:2.7,run tar:bzip2
 GNU_CONFIGURE=	yes
 
 post-patch:
diff --git a/textproc/kiss-templates/Makefile b/textproc/kiss-templates/Makefile
index fad7a858b035..39dc01f6e2fb 100644
--- a/textproc/kiss-templates/Makefile
+++ b/textproc/kiss-templates/Makefile
@@ -31,7 +31,7 @@ USES=			cmake
 OPTIONS_DEFINE=		TEST
 TEST_DESC=		Build with unit tests
 TEST_BUILD_DEPENDS=	boost-libs>=1.55:devel/boost-libs
-TEST_USES=		python:2,build,test shebangfix
+TEST_USES=		python:2.7,build,test shebangfix
 TEST_TEST_TARGET=	test
 SHEBANG_FILES=		tests/comparison-based/generate.py tests/differ.py
 
diff --git a/textproc/kreport/Makefile b/textproc/kreport/Makefile
index 4565222ba519..b23353dd190e 100644
--- a/textproc/kreport/Makefile
+++ b/textproc/kreport/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=		kreport
 DISTVERSION=		3.0.2
+PORTREVISION=	1
 CATEGORIES=		textproc kde
 MASTER_SITES=		KDE/stable/${PORTNAME}/src
 DIST_SUBDIR=		KDE/${PORTNAME}
@@ -11,7 +12,7 @@ COMMENT=		Framework for creation of reports in multiple formats
 
 LIB_DEPENDS=		libKPropertyCore3.so:x11-toolkits/kproperty
 
-USES=			cmake:outsource gettext kde:5 python:2 tar:xz
+USES=			cmake:outsource gettext kde:5 python:2.7 tar:xz
 USE_KDE=		config coreaddons ecm widgetsaddons
 USE_QT5=		core gui network qml webkit widgets xml \
 			buildtools_build printsupport qmake_build
diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile
index 5b8a3de1a627..0eefaba45e00 100644
--- a/textproc/link-grammar/Makefile
+++ b/textproc/link-grammar/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	link-grammar
 PORTVERSION=	5.3.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.abisource.com/downloads/${PORTNAME}/${PORTVERSION}/
 
@@ -48,7 +48,7 @@ PERL_LDFLAGS=			-L${LOCALBASE}/lib/perl5/${PERL_VER}/${PERL_ARCH}/CORE -lperl
 PERL_USES=			perl5
 
 PYTHON_CONFIGURE_ENABLE=	python-bindings
-PYTHON_USES=			python:2
+PYTHON_USES=			python:2.7
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/textproc/loook/Makefile b/textproc/loook/Makefile
index b89d6347f68b..a4e2ee40ae8c 100644
--- a/textproc/loook/Makefile
+++ b/textproc/loook/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	loook
 PORTVERSION=	0.6.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.danielnaber.de/loook/
 DISTNAME=	${PORTNAME}
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter@${PY_FLAV
 
 WRKSRC=		${WRKDIR}
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/textproc/py-bugzillatools/Makefile b/textproc/py-bugzillatools/Makefile
index d04afd7aa721..0cf2879cb1b1 100644
--- a/textproc/py-bugzillatools/Makefile
+++ b/textproc/py-bugzillatools/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bugzillatools
 PORTVERSION=	0.5.5
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	Tool for interacting with the Bugzilla bug tracking system
 
 LICENSE=	GPLv3
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-dsv/Makefile b/textproc/py-dsv/Makefile
index 0baa491445ad..7aa6c9254de6 100644
--- a/textproc/py-dsv/Makefile
+++ b/textproc/py-dsv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dsv
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	SF/python-${PORTNAME}/python-${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +12,7 @@ DISTNAME=	${PORTNAME:tu}-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python module to parse or write delimeter-separated (e.g. CSV) files
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 DSV_BASEDIR=	${PYTHONPREFIX_SITELIBDIR}/DSV
 NO_ARCH=	yes
diff --git a/textproc/py-elasticsearch-dsl-py/Makefile b/textproc/py-elasticsearch-dsl-py/Makefile
index efef7628661a..2317b2e3b6ee 100644
--- a/textproc/py-elasticsearch-dsl-py/Makefile
+++ b/textproc/py-elasticsearch-dsl-py/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	elasticsearch-dsl-py
 PORTVERSION=	0.0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -18,7 +18,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dateutil>=0:devel/py-dateutil@${FLAVOR}
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/textproc/py-elasticsearch2-dsl-py/Makefile b/textproc/py-elasticsearch2-dsl-py/Makefile
index 09f3b75624a8..2930449d1829 100644
--- a/textproc/py-elasticsearch2-dsl-py/Makefile
+++ b/textproc/py-elasticsearch2-dsl-py/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	py-elasticsearch2-dsl-py
 PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -18,7 +18,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
 GH_PROJECT=	elasticsearch-dsl-py
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/textproc/py-excelerator/Makefile b/textproc/py-excelerator/Makefile
index ac145b59b5fe..ec5be35bd659 100644
--- a/textproc/py-excelerator/Makefile
+++ b/textproc/py-excelerator/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	excelerator
 PORTVERSION=	0.6.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	SF/py${PORTNAME}/pyExcelerator/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	Python library for generating Excel 97/2000/XP/2003 files
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/textproc/py-jaxml/Makefile b/textproc/py-jaxml/Makefile
index f8b9debddce3..6256b84ff2b6 100644
--- a/textproc/py-jaxml/Makefile
+++ b/textproc/py-jaxml/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jaxml
 PORTVERSION=	3.02
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 PORTSCOUT=	skipv:23.01
 
 NO_ARCH=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/textproc/py-pdfminer/Makefile b/textproc/py-pdfminer/Makefile
index bc798cc4b1c2..6fcff4ca6e57 100644
--- a/textproc/py-pdfminer/Makefile
+++ b/textproc/py-pdfminer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pdfminer
 PORTVERSION=	20140328
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ COMMENT=	PDF parser and analyzer
 
 LICENSE=	MIT
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-pyes/Makefile b/textproc/py-pyes/Makefile
index 09b8b74375ba..3209f6a8766e 100644
--- a/textproc/py-pyes/Makefile
+++ b/textproc/py-pyes/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyes
 PORTVERSION=	0.99.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	Python connector for ElasticSearch - the pythonic way to use ElasticSea
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}urllib3>=0:net/py-urllib3@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-rstyoutube/Makefile b/textproc/py-rstyoutube/Makefile
index 6ee2a23612eb..5e718eaa75e5 100644
--- a/textproc/py-rstyoutube/Makefile
+++ b/textproc/py-rstyoutube/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	rstyoutube
 PORTVERSION=	0.1.1
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	MIT
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>=0.11:textproc/py-docutils@${FLAVOR}
 
-USES=	python:2
+USES=	python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py-tvgrab/Makefile b/textproc/py-tvgrab/Makefile
index 349b143d3421..09eca71c7009 100644
--- a/textproc/py-tvgrab/Makefile
+++ b/textproc/py-tvgrab/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	TVGrab
 PORTVERSION=	0.5.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc python
 MASTER_SITES=	SF/py${PORTNAME:tl}/lib/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	DOCS
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/textproc/py-xlutils/Makefile b/textproc/py-xlutils/Makefile
index 88af92337ccc..4ab780ec0f2c 100644
--- a/textproc/py-xlutils/Makefile
+++ b/textproc/py-xlutils/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xlutils
 PORTVERSION=	1.7.0
+PORTREVISION=	1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ BUILD_DEPENDS=  ${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.2:textproc/py-xlrd@${FLAVOR} \
 				${PYTHON_PKGNAMEPREFIX}xlwt>=0.7.4:textproc/py-xlwt@${FLAVOR}
 RUN_DEPENDS:=   ${BUILD_DEPENDS}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/textproc/py2html/Makefile b/textproc/py2html/Makefile
index e652e771fd7a..1f7ed8d2e3a8 100644
--- a/textproc/py2html/Makefile
+++ b/textproc/py2html/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	py2html
 PORTVERSION=	0.7
+PORTREVISION=	1
 CATEGORIES=	textproc www python
 MASTER_SITES=	LOCAL/perky
 PKGNAMESUFFIX=	-${PYTHON_PKGNAMEPREFIX:S/-//}
@@ -10,7 +11,7 @@ PKGNAMESUFFIX=	-${PYTHON_PKGNAMEPREFIX:S/-//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python Highlighter for HTML
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_PYTHON=	distutils autoplist
 
 SHEBANG_FILES=	py2html
diff --git a/textproc/pychm/Makefile b/textproc/pychm/Makefile
index 33253757b2ca..7e8948e5d93f 100644
--- a/textproc/pychm/Makefile
+++ b/textproc/pychm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pychm
 PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc python
 MASTER_SITES=	SF/gnochm/${PORTNAME}/${PORTVERSION}
 
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libchm.so:misc/chmlib
 
 NO_BUILD=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.pre.mk>
diff --git a/textproc/queequeg/Makefile b/textproc/queequeg/Makefile
index 74a5b09a84fd..ae0cc9b2ee03 100644
--- a/textproc/queequeg/Makefile
+++ b/textproc/queequeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	queequeg
 PORTVERSION=	0.91
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	wn:textproc/wordnet \
 		${PYTHON_SITELIBDIR}/cdbmodule.so:databases/py-cdb
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cdbmodule.so:databases/py-cdb
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 SHEBANG_FILES=	*.py misc/*.py qq
 ALL_TARGET=	dict
 MAKE_ARGS=	WORDNETDICT="${LOCALBASE}/share/WordNet" \
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index 6c4e7eaf61a4..d4d9359f53bb 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rubber
 PORTVERSION=	1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc
 MASTER_SITES=	http://launchpadlibrarian.net/53558954/
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 NO_ARCH=	yes
 
-USES=		gmake makeinfo python:2
+USES=		gmake makeinfo python:2.7
 USE_TEX=	latex
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --infodir=${PREFIX}/${INFO_PATH} \
diff --git a/textproc/xxdiff-scripts/Makefile b/textproc/xxdiff-scripts/Makefile
index 0f5e8fc6ceb9..7f63fb22e49d 100644
--- a/textproc/xxdiff-scripts/Makefile
+++ b/textproc/xxdiff-scripts/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xxdiff
 PORTVERSION=	4.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-scripts
@@ -15,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	xxdiff:textproc/xxdiff
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_PKGNAME=	xxdiff-scripts
 NO_ARCH=	yes
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index 8ad457ded02b..d0049e5b9a39 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	cherokee
 PORTVERSION=	1.2.104
 DISTVERSIONPREFIX=	v
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www
 
 MAINTAINER=	ports@FreeBSD.org
@@ -58,8 +58,8 @@ OPTIONS_DEFAULT=	ADMIN GEOIP
 OPTIONS_SUB=		yes
 
 ADMIN_DESC=		Build the Admin Interface
-ADMIN_USES=		python:2
-ADMIN_USES_OFF=		python:2,build 
+ADMIN_USES=		python:2.7
+ADMIN_USES_OFF=		python:2.7,build 
 ADMIN_CONFIGURE_OFF=	--disable-admin
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ON=	--with-ffmpeg=yes
diff --git a/www/cppcms/Makefile b/www/cppcms/Makefile
index 56b3dad5b5ad..4be324810172 100644
--- a/www/cppcms/Makefile
+++ b/www/cppcms/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cppcms
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/cppcms/${PORTNAME}/${PORTVERSION}
 
@@ -15,7 +15,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre
 
 BROKEN_powerpc64=	Does not build: error: 'localeconv_l' was not declared in this scope
 
-USES=		cmake python:2 shebangfix tar:bzip2 ssl
+USES=		cmake python:2.7 shebangfix tar:bzip2 ssl
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	bin/cppcms_tmpl_cc
 
@@ -42,6 +42,9 @@ CMAKE_ARGS+=	-DDISABLE_GCRYPT:BOOL=OFF
 CMAKE_ARGS+=	-DDISABLE_GCRYPT:BOOL=ON
 .endif
 
+post-patch:
+	${REINPLACE_CMD}  -e 's/python2/${PYTHON_VERSION}/' ${WRKSRC}/CMakeLists.txt
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
diff --git a/www/gaeutilities/Makefile b/www/gaeutilities/Makefile
index cae8d279bedd..0cda9ac0ad8a 100644
--- a/www/gaeutilities/Makefile
+++ b/www/gaeutilities/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gaeutilities
 PORTVERSION=	1.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www devel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -12,7 +12,7 @@ COMMENT=	Utility classes to make working with Google App Engine easier
 
 RUN_DEPENDS=	google-appengine>=1.2.4_1:www/google-appengine
 
-USES=		python:2 # same as www/google-appengine
+USES=		python:2.7 # same as www/google-appengine
 USE_GITHUB=	yes
 GH_ACCOUNT=	joerussbowman
 GH_TAGNAME=	ea3f7e1
diff --git a/www/google-sitemapgen/Makefile b/www/google-sitemapgen/Makefile
index 25206f7ad84e..8e97c78af937 100644
--- a/www/google-sitemapgen/Makefile
+++ b/www/google-sitemapgen/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	google-sitemapgen
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	https://fossies.org/linux/www/old/
 DISTNAME=	sitemap_gen_${PORTVERSION}
@@ -12,7 +13,7 @@ COMMENT=	Script to analyze web server and generate Google Sitemap files
 
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/jtoolkit/Makefile b/www/jtoolkit/Makefile
index c348239c51d9..95323f2e495b 100644
--- a/www/jtoolkit/Makefile
+++ b/www/jtoolkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jToolkit
 PORTVERSION=	0.7.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	SF
 
@@ -14,7 +14,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}kid>=0.9.5:devel/py-kid@${FLAVOR}
 # Has optional dependencies on database engines
 # Can optionally use py-lucene (on i386)
 
-USES=		python:2
+USES=		python:2.7
 NO_ARCH=	yes
 USE_PYTHON=	distutils
 PYSETUP=	${PORTNAME}Setup.py
diff --git a/www/linkchecker/Makefile b/www/linkchecker/Makefile
index 1bf20c6f4863..1ef7dc2e65ac 100644
--- a/www/linkchecker/Makefile
+++ b/www/linkchecker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	linkchecker
 PORTVERSION=	9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 DISTNAME=	LinkChecker-${PORTVERSION}
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${FLAVOR} \
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USES=		cpe python:2
+USES=		cpe python:2.7
 CPE_VENDOR=	bastian_kleineidam
 USE_PYTHON=	distutils autoplist
 INSTALLS_ICONS=	yes
diff --git a/www/node/Makefile b/www/node/Makefile
index fcd191130b65..759936e489cf 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -41,7 +41,7 @@ NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
 DTRACE_CONFIGURE_ON=	--with-dtrace
 
-USES=		compiler:c++11-lib gmake python:2,build pkgconfig \
+USES=		compiler:c++11-lib gmake python:2.7,build pkgconfig \
 		localbase shebangfix
 
 HAS_CONFIGURE=	yes
diff --git a/www/node4/Makefile b/www/node4/Makefile
index 4d3dc421f8c1..5dd5e28edbbf 100644
--- a/www/node4/Makefile
+++ b/www/node4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	node
 PORTVERSION=	4.8.7
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 MASTER_SITES=	http://nodejs.org/dist/v${PORTVERSION}/
@@ -28,7 +29,7 @@ BUNDLED_SSL_CONFIGURE_OFF=	--shared-openssl
 NLS_CONFIGURE_ON=	--with-intl=system-icu
 NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
-USES=		compiler:c++11-lib gmake python:2 pkgconfig localbase
+USES=		compiler:c++11-lib gmake python:2.7 pkgconfig localbase
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/www/node6/Makefile b/www/node6/Makefile
index 25524f5a5ca4..d8faae2260f2 100644
--- a/www/node6/Makefile
+++ b/www/node6/Makefile
@@ -40,7 +40,7 @@ NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
 DTRACE_CONFIGURE_ON=	--with-dtrace
 
-USES=		compiler:c++11-lib gmake python:2,build pkgconfig \
+USES=		compiler:c++11-lib gmake python:2.7,build pkgconfig \
 		localbase shebangfix
 
 HAS_CONFIGURE=	yes
diff --git a/www/node8/Makefile b/www/node8/Makefile
index 03e3d2b94549..2a2161ab694c 100644
--- a/www/node8/Makefile
+++ b/www/node8/Makefile
@@ -42,7 +42,7 @@ NLS_LIB_DEPENDS=	libicui18n.so:devel/icu
 
 DTRACE_CONFIGURE_ON=	--with-dtrace
 
-USES=		compiler:c++11-lib gmake python:2,build pkgconfig \
+USES=		compiler:c++11-lib gmake python:2.7,build pkgconfig \
 		localbase shebangfix
 
 HAS_CONFIGURE=	yes
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index a5d1edcca6b2..1589060b624a 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	HTMLgen
 PORTVERSION=	2.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	LOCAL/dryice \
 		http://dryice.name/computer/FreeBSD/distfiles/ \
@@ -14,7 +14,7 @@ DISTNAME=	HTMLgen
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python library for the generation of HTML documents
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_PYTHON=	flavors
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/www/py-albatross/Makefile b/www/py-albatross/Makefile
index b1313fbcfd1c..4f4f4e584f85 100644
--- a/www/py-albatross/Makefile
+++ b/www/py-albatross/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	albatross
 PORTVERSION=	1.42
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://object-craft.com.au/projects/albatross/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ COMMENT=	Python toolkit for developing highly stateful web applications
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENCE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
diff --git a/www/py-amf/Makefile b/www/py-amf/Makefile
index 0a8e62301955..bc716fbe3fe0 100644
--- a/www/py-amf/Makefile
+++ b/www/py-amf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	amf
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ COMMENT=	AMF support for Python
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 post-install:
diff --git a/www/py-apachelog/Makefile b/www/py-apachelog/Makefile
index b1a4a20cee25..e9204c27ae4c 100644
--- a/www/py-apachelog/Makefile
+++ b/www/py-apachelog/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	apachelog
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/apachelog/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -15,7 +15,7 @@ COMMENT=	Python access log parser
 LICENSE=	ART10 GPLv1+ # same as Perl
 LICENSE_COMB=	dual
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/py-beautifulsoup32/Makefile b/www/py-beautifulsoup32/Makefile
index acab200c1d93..b94edbcf2244 100644
--- a/www/py-beautifulsoup32/Makefile
+++ b/www/py-beautifulsoup32/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	beautifulsoup
 PORTVERSION=	3.2.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://www.crummy.com/software/BeautifulSoup/bs3/download//3.x/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -12,7 +13,7 @@ DISTNAME=	BeautifulSoup-${PORTVERSION}
 MAINTAINER=	mwm@mired.org
 COMMENT=	HTML/XML Parser for Python
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 CONFLICTS=	py[0-9]*-beautifulsoup-3.0.*
diff --git a/www/py-blogofile/Makefile b/www/py-blogofile/Makefile
index e4b816c6e467..314ab7f6d29a 100644
--- a/www/py-blogofile/Makefile
+++ b/www/py-blogofile/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	blogofile
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP/source/B/Blogofile
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -25,7 +26,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}unidecode>=0:converters/py-unidecode@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/py-cherrypy-old/Makefile b/www/py-cherrypy-old/Makefile
index b0058a209dac..45e8abebb7d0 100644
--- a/www/py-cherrypy-old/Makefile
+++ b/www/py-cherrypy-old/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cherrypy
 PORTVERSION=	2.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://download.cherrypy.org/${PORTNAME}/${PORTVERSION}/
@@ -16,7 +16,7 @@ COMMENT=	Pythonic, object-oriented web development framework
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 PORTSCOUT=	ignore:1        # This the last version of 2.3.X branch
diff --git a/www/py-clientform/Makefile b/www/py-clientform/Makefile
index 96d77644d37e..74a8e2fb9369 100644
--- a/www/py-clientform/Makefile
+++ b/www/py-clientform/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	clientform
 PORTVERSION=	0.2.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://wwwsearch.sourceforge.net/ClientForm/src/ \
 		CHEESESHOP
@@ -13,7 +13,7 @@ DISTNAME=	ClientForm-${PORTVERSION}
 MAINTAINER=	lwhsu@FreeBSD.org
 COMMENT=	Client-side HTTP Form for Python
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/py-collective.easytemplate/Makefile b/www/py-collective.easytemplate/Makefile
index 911e640b86e1..47f9bf0cb406 100644
--- a/www/py-collective.easytemplate/Makefile
+++ b/www/py-collective.easytemplate/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	collective.easytemplate
 PORTVERSION=	0.8.0
+PORTREVISION=	1
 CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CM
 		${PYTHON_PKGNAMEPREFIX}feedparser>=0:textproc/py-feedparser@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}collective.templateengines>=0.3:www/py-collective.templateengines@${FLAVOR}
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/py-collective.templateengines/Makefile b/www/py-collective.templateengines/Makefile
index 3572e114b09c..07ae611f3892 100644
--- a/www/py-collective.templateengines/Makefile
+++ b/www/py-collective.templateengines/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	collective.templateengines
 PORTVERSION=	0.3.5
+PORTREVISION=	1
 CATEGORIES=	www python zope
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Products.CMFCore>=2.1.0:devel/py-Products.CMFCore@${FLAVOR}
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-django-appmedia/Makefile b/www/py-django-appmedia/Makefile
index 60b6b1d43a00..4108f92e28d4 100644
--- a/www/py-django-appmedia/Makefile
+++ b/www/py-django-appmedia/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-appmedia
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ COMMENT=	Serve static content from within django app directories
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/django/bin/django-admin.py:www/py-django18@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index 519993a8d917..c24b419846d1 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-cms
 PORTVERSION=	2.4.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}south>=0.7.3:databases/py-south@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-sekizai>=0.6.1:www/py-django-sekizai@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}html5lib>=0.90:www/py-html5lib@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 OPTIONS_MULTI=	DATABASE
diff --git a/www/py-django-extensions/Makefile b/www/py-django-extensions/Makefile
index 0e179d530354..e5346542a6b2 100644
--- a/www/py-django-extensions/Makefile
+++ b/www/py-django-extensions/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	django-extensions
 PORTVERSION=	1.6.7
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>=0:www/py-django18@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${FLAVOR}
 
 NO_ARCH=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/py-django-livesettings/Makefile b/www/py-django-livesettings/Makefile
index bf2a14c748d4..69e0a044fa6b 100644
--- a/www/py-django-livesettings/Makefile
+++ b/www/py-django-livesettings/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-livesettings
 DISTVERSION=	1.4-16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP/source/d/${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_hg>=0.4:devel/py-setuptools_hg@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-django-sekizai/Makefile b/www/py-django-sekizai/Makefile
index 3c69d0f80742..648c324edf22 100644
--- a/www/py-django-sekizai/Makefile
+++ b/www/py-django-sekizai/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	django-sekizai
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	Block templating system for Django
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}django18>0:www/py-django18@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}django-classy-tags>=0.3.1:www/py-django-classy-tags@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-funkload/Makefile b/www/py-funkload/Makefile
index d140f9f6ffb8..0550626f25a7 100644
--- a/www/py-funkload/Makefile
+++ b/www/py-funkload/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	funkload
 PORTVERSION=	1.17.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +18,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:www/py-webunit@${FLAVOR} \
 		tcpwatch.py:net/tcpwatch
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/py-graphite-web/Makefile b/www/py-graphite-web/Makefile
index e08d48feaf84..bfd646ba38cd 100644
--- a/www/py-graphite-web/Makefile
+++ b/www/py-graphite-web/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	graphite-web
 PORTVERSION=	0.9.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=1.8.10:graphics/py-cairo@${FLAVOR} \
 		xorg-fonts-truetype>=0:x11-fonts/xorg-fonts-truetype
 
 FETCH_ARGS=	-o ${DISTNAME}${EXTRACT_SUFX}
-USES=		cpe python:2
+USES=		cpe python:2.7
 USE_GITHUB=	yes
 GH_ACCOUNT=	graphite-project
 CPE_VENDOR=	graphite_project
diff --git a/www/py-jswebkit/Makefile b/www/py-jswebkit/Makefile
index f4959d67c558..791edf70279d 100644
--- a/www/py-jswebkit/Makefile
+++ b/www/py-jswebkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jswebkit
 PORTVERSION=	0.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www python
 MASTER_SITES=	http://archive.ubuntu.com/ubuntu/pool/universe/p/python-jswebkit/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	WebKit/JavaScriptCore Python bindings
 
 LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
-USES=		pkgconfig python:2
+USES=		pkgconfig python:2.7
 USE_PYTHON=	distutils autoplist cython cython_run
 WRKSRC=		${WRKDIR}/python-${PORTNAME}-${PORTVERSION}
 
diff --git a/www/py-meld/Makefile b/www/py-meld/Makefile
index f4cbbd996c00..3394f5c3c91b 100644
--- a/www/py-meld/Makefile
+++ b/www/py-meld/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	meld
 PORTVERSION=	2.1.4
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	http://entrian.com/PyMeld/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +16,7 @@ COMMENT=	System for manipulating HTML using a Pythonic object model
 
 LICENSE=	MIT
 
-USES=		python:2
+USES=		python:2.7
 
 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/PyMeld.py \
 		%%PYTHON_SITELIBDIR%%/PyMeld.pyc \
diff --git a/www/py-meld3/Makefile b/www/py-meld3/Makefile
index 4eea0da0c650..6ed02f24e5b6 100644
--- a/www/py-meld3/Makefile
+++ b/www/py-meld3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	meld3
 PORTVERSION=	0.6.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	tn@0x746e.org.ua
 COMMENT=	HTML/XML templating system for Python
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-mt/Makefile b/www/py-mt/Makefile
index 206e620c5b46..d4b92aa49994 100644
--- a/www/py-mt/Makefile
+++ b/www/py-mt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mt
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/PyMT-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Python module which provides Movable Type XML-RPC connectivity
 
 LICENSE=	PSFL  # says License: python
 
-USES=		python:2
+USES=		python:2.7
 NO_BUILD=	yes
 NO_ARCH=	yes
 
diff --git a/www/py-prewikka/Makefile b/www/py-prewikka/Makefile
index 96651ea5cb34..6363cbd7dbf4 100644
--- a/www/py-prewikka/Makefile
+++ b/www/py-prewikka/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	prewikka
 PORTVERSION=	1.0.1p1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www security python
 MASTER_SITES=	https://www.prelude-ids.org/attachments/download/286/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	cheetah-compile:devel/py-cheetah
 LIB_DEPENDS=	libprelude.so:security/libprelude \
 		libpreludedb.so:security/libpreludedb
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils
 
 OPTIONS_DEFINE=	NLS
diff --git a/www/py-rhodecode/Makefile b/www/py-rhodecode/Makefile
index b6dc191c4294..b863c0ef1c9a 100644
--- a/www/py-rhodecode/Makefile
+++ b/www/py-rhodecode/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rhodecode
 PORTVERSION=	1.7.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -38,7 +38,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pylons>=1.0:www/py-pylons@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}celery>=0:devel/py-celery@${FLAVOR} \
 		mercurial>=2.6:devel/mercurial
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 USE_RC_SUBR=		rhodecode
diff --git a/www/py-slimit/Makefile b/www/py-slimit/Makefile
index b15f816af5af..c4c1703797e6 100644
--- a/www/py-slimit/Makefile
+++ b/www/py-slimit/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	slimit
 PORTVERSION=	0.8.1
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +15,7 @@ LICENSE=	MIT
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ply>=3.4:devel/py-ply@${FLAVOR}
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/py-surl/Makefile b/www/py-surl/Makefile
index 3bc819c68697..a6e32c24432a 100644
--- a/www/py-surl/Makefile
+++ b/www/py-surl/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	surl
 PORTVERSION=	0.7.1.1
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://launchpadlibrarian.net/96097348/ \
 		http://www.c-s.li/ports/
@@ -13,7 +14,7 @@ COMMENT=	URL shortening command line application
 
 LICENSE=	GPLv3
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils
 
 post-patch:
diff --git a/www/py-tmdb3/Makefile b/www/py-tmdb3/Makefile
index 1d74004de66d..0f549830bb40 100644
--- a/www/py-tmdb3/Makefile
+++ b/www/py-tmdb3/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tmdb3
 PORTVERSION=	0.7.2
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,7 +11,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	wg@FreeBSD.org
 COMMENT=	TheMovieDB.org APIv3 interface
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-uliweb/Makefile b/www/py-uliweb/Makefile
index 0f4d4aafac6a..39f486561477 100644
--- a/www/py-uliweb/Makefile
+++ b/www/py-uliweb/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	uliweb
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -14,7 +15,7 @@ LICENSE=	BSD2CLAUSE
 USE_GITHUB=	yes
 GH_ACCOUNT=	limodou
 
-USES=		dos2unix python:2
+USES=		dos2unix python:2.7
 USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
diff --git a/www/py-webhelpers/Makefile b/www/py-webhelpers/Makefile
index adc8e96faebf..69b3be6b3b00 100644
--- a/www/py-webhelpers/Makefile
+++ b/www/py-webhelpers/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	webhelpers
 PORTVERSION=	1.3
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +17,7 @@ LICENSE=	BSD3CLAUSE
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}routes>=1.1:www/py-routes@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}MarkupSafe>=0.11:textproc/py-MarkupSafe@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 
 .include <bsd.port.mk>
diff --git a/www/py-webkitgtk/Makefile b/www/py-webkitgtk/Makefile
index e775e5df4c84..ffe5d65c376b 100644
--- a/www/py-webkitgtk/Makefile
+++ b/www/py-webkitgtk/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	webkitgtk
 PORTVERSION=	1.1.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www python
 MASTER_SITES=	https://pkgs.fedoraproject.org/repo/extras/pywebkitgtk/pywebkitgtk-1.1.8.tar.bz2/19f3c184eebcfde1c9d1ce56bbe75cf2/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libwebkitgtk-1.0.so:www/webkit-gtk2
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pathfix pkgconfig python:2 tar:bzip2
+USES=		gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
 USE_GNOME=	glib20 libxslt pygtk2
 USE_PYTHON=	flavors
 
diff --git a/www/pyblosxom/Makefile b/www/pyblosxom/Makefile
index 80f2a44f85a1..2c484dfe23d8 100644
--- a/www/pyblosxom/Makefile
+++ b/www/pyblosxom/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pyblosxom
 DISTVERSION=	1.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www python
 MASTER_SITES=	http://pyblosxom.github.io/download/
 
@@ -12,7 +12,7 @@ COMMENT=	Lightweight weblog system
 
 LICENSE=	MIT
 
-USES=		python:2 shebangfix
+USES=		python:2.7 shebangfix
 USE_PYTHON=	distutils
 SHEBANG_FILES=	Pyblosxom/data/pyblosxom.cgi
 
diff --git a/www/pycarddav/Makefile b/www/pycarddav/Makefile
index 0239dcc16f21..4a56fc2b48a0 100644
--- a/www/pycarddav/Makefile
+++ b/www/pycarddav/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	pycarddav
 PORTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -20,7 +21,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 PLIST_FILES+=	man/man1/pc_query.1.gz \
diff --git a/www/qooxdoo/Makefile b/www/qooxdoo/Makefile
index 629583af52aa..abb9f23dddd9 100644
--- a/www/qooxdoo/Makefile
+++ b/www/qooxdoo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qooxdoo
 PORTVERSION=	5.0.1
+PORTREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-current/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-sdk
@@ -13,7 +14,7 @@ COMMENT=	Comprehensive and innovative Ajax application framework
 LICENSE=	LGPL3 EPL
 LICENSE_COMB=	dual
 
-USES=		zip python:2
+USES=		zip python:2.7
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/www/radicale/Makefile b/www/radicale/Makefile
index 3b0f2f9bf282..d0dec0171922 100644
--- a/www/radicale/Makefile
+++ b/www/radicale/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		radicale
 PORTVERSION=		1.1.2
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		www python
 MASTER_SITES=		CHEESESHOP
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
@@ -29,7 +29,7 @@ HTTP_DESC=		HTTP authentication support
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHTTP} || ${PORT_OPTIONS:MLDAP}
-USES+=		python:2
+USES+=		python:2.7
 .else
 USES+=		python
 .endif
diff --git a/www/trac-accountmanager/Makefile b/www/trac-accountmanager/Makefile
index bbe780084d39..6f603b79e120 100644
--- a/www/trac-accountmanager/Makefile
+++ b/www/trac-accountmanager/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	accountmanager
 PORTVERSION=	0.5.${REV}
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/kuriyama \
@@ -20,7 +20,7 @@ RUN_DEPENDS=	tracd:www/trac
 
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 REV=			12583
-USES=			python:2 zip
+USES=			python:2.7 zip
 USE_PYTHON=		distutils autoplist
 WRKSRC=			${WRKDIR}/accountmanagerplugin/trunk
 NO_ARCH=		yes
diff --git a/www/trac-attachmentpolicy/Makefile b/www/trac-attachmentpolicy/Makefile
index b5b50db20c7f..5e7f3fd9badc 100644
--- a/www/trac-attachmentpolicy/Makefile
+++ b/www/trac-attachmentpolicy/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	attachmentpolicy
 PORTVERSION=	0.1.0.${SVN_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	http://distfiles.cse.tw/ \
 		http://trac-hacks.org/changeset/${SVN_REV}/attachmentpolicyplugin?old_path=/&format=zip&filename=/
@@ -20,7 +20,7 @@ SVN_REV=	12775
 RUN_DEPENDS+=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-autocomplete/Makefile b/www/trac-autocomplete/Makefile
index af1ce41e20a1..92cfa05f6bf5 100644
--- a/www/trac-autocomplete/Makefile
+++ b/www/trac-autocomplete/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	autocomplete
 PORTVERSION=	0.4.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/
 PKGNAMEPREFIX=	trac-
@@ -14,7 +14,7 @@ COMMENT=	Plugin for autocompletion of user names in ticket fields
 
 RUN_DEPENDS=	trac>=0.11:www/trac
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 WRKSRC=		${WRKDIR}/autocompleteusersplugin/0.11
 NO_ARCH=	yes
diff --git a/www/trac-bzr/Makefile b/www/trac-bzr/Makefile
index 287af868ff23..30209955c748 100644
--- a/www/trac-bzr/Makefile
+++ b/www/trac-bzr/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bzr
 PORTVERSION=	20110228
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	http://schema.filez.com/distfiles/
 PKGNAMEPREFIX=	trac-
@@ -18,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	tracd:www/trac \
 		bzr:devel/bzr
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-ccselector/Makefile b/www/trac-ccselector/Makefile
index 2d4ebf27b675..9560d63792d3 100644
--- a/www/trac-ccselector/Makefile
+++ b/www/trac-ccselector/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ccselector
 PORTVERSION=	0.0.2.4001
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
@@ -16,7 +16,7 @@ COMMENT=	Visually edit the Trac ticket CC field
 RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-childtickets/Makefile b/www/trac-childtickets/Makefile
index 725698fdc2e6..41575ad196c5 100644
--- a/www/trac-childtickets/Makefile
+++ b/www/trac-childtickets/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	childtickets
 PORTVERSION=	2.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	http://schema.filez.com/distfiles/
 PKGNAMEPREFIX=	trac-
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	trac>=0.12:www/trac
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 
 WRKSRC=		${WRKDIR}/childticketsplugin/0.12
 
diff --git a/www/trac-customfieldadmin/Makefile b/www/trac-customfieldadmin/Makefile
index 8ae6cfa05182..5e069bec3102 100644
--- a/www/trac-customfieldadmin/Makefile
+++ b/www/trac-customfieldadmin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	customfieldadmin
 PORTVERSION=	0.2.2.6485
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
@@ -21,7 +21,7 @@ RUN_DEPENDS=	tracd:www/trac
 
 PORTSCOUT=	skipv:0.2.6485
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
 USE_PYTHON=	distutils autoplist
diff --git a/www/trac-datefield/Makefile b/www/trac-datefield/Makefile
index d4d248817bf7..643f7bbfb5aa 100644
--- a/www/trac-datefield/Makefile
+++ b/www/trac-datefield/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	datefield
 PORTVERSION=	1.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/
 PKGNAMEPREFIX=	trac-
@@ -14,7 +14,7 @@ COMMENT=	Plugin for creating date fields
 
 RUN_DEPENDS=	trac>=0.11:www/trac
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/datefieldplugin/0.11
diff --git a/www/trac-defaultcc/Makefile b/www/trac-defaultcc/Makefile
index 7310500d9809..9d81913ef3df 100644
--- a/www/trac-defaultcc/Makefile
+++ b/www/trac-defaultcc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	defaultcc
 PORTVERSION=	0.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/trac-${PORTNAME}/
 PKGNAMEPREFIX=	trac-
@@ -16,7 +16,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	trac>=0.11:www/trac
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
diff --git a/www/trac-discussion/Makefile b/www/trac-discussion/Makefile
index b759553dc715..4e0f712efc55 100644
--- a/www/trac-discussion/Makefile
+++ b/www/trac-discussion/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	discussion
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -13,7 +13,7 @@ COMMENT=	Discussion forum plugin for Trac
 RUN_DEPENDS=	tracd:www/trac \
 		trac-TracSpamFilter>=0.2.1:www/trac-spam-filter
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-downloads/Makefile b/www/trac-downloads/Makefile
index cb4f141ee8f2..da4df7ff23e9 100644
--- a/www/trac-downloads/Makefile
+++ b/www/trac-downloads/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	downloads
 PORTVERSION=	${TRAC_VERSION}.${PLUGIN_VERSION}.${SVN_REV}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -18,7 +18,7 @@ TRAC_VERSION=	0.12
 PLUGIN_VERSION=	0.3
 SVN_REV=	10047
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-email2trac/Makefile b/www/trac-email2trac/Makefile
index af718a8ebace..e91e76704ef1 100644
--- a/www/trac-email2trac/Makefile
+++ b/www/trac-email2trac/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	email2trac
 PORTVERSION=	2.11.0
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	ftp://ftp.sara.nl/pub/outgoing/
 PKGNAMEPREFIX=	trac-
@@ -24,7 +25,7 @@ TRACUSER?=	${WWWOWN}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-trac-user=${TRACUSER} --with-mta-user=${MTAUSER}
-USES=		python:2
+USES=		python:2.7
 
 PORTDOCS=	AUTHORS ChangeLog INSTALL README
 
diff --git a/www/trac-estimator/Makefile b/www/trac-estimator/Makefile
index 192b7f9a7959..33072a167ed4 100644
--- a/www/trac-estimator/Makefile
+++ b/www/trac-estimator/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	estimator
 PORTVERSION=	0.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
@@ -15,7 +15,7 @@ COMMENT=	Produce detailed range-based estimations for Trac tickets
 RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.11
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-fivestarvote/Makefile b/www/trac-fivestarvote/Makefile
index 2e516dff390b..7104738f142f 100644
--- a/www/trac-fivestarvote/Makefile
+++ b/www/trac-fivestarvote/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fivestarvote
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -12,7 +12,7 @@ COMMENT=	Five star plugin for voting on Trac resources
 
 RUN_DEPENDS=	tracd:www/trac
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-fullblog/Makefile b/www/trac-fullblog/Makefile
index 8cd509adcfab..01413b286d23 100644
--- a/www/trac-fullblog/Makefile
+++ b/www/trac-fullblog/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fullblog
 PORTVERSION=	0.1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -15,7 +15,7 @@ COMMENT=	Plugin that provides a project Blog
 RUN_DEPENDS=	htmldoc:textproc/htmldoc \
 		tracd:www/trac
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-fullblognotification/Makefile b/www/trac-fullblognotification/Makefile
index 2c5e9cf57c57..07964434ab7d 100644
--- a/www/trac-fullblognotification/Makefile
+++ b/www/trac-fullblognotification/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	fullblognotification
 PORTVERSION=	0.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -14,7 +14,7 @@ COMMENT=	Plugin that provides a project Blog
 
 RUN_DEPENDS=	trac-fullblog>=0.1.1:www/trac-fullblog
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-gantt/Makefile b/www/trac-gantt/Makefile
index 2cbf21eb49d9..b32ab8483257 100644
--- a/www/trac-gantt/Makefile
+++ b/www/trac-gantt/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	TracGantt
 PORTVERSION=	0.3.2a
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www devel python
 MASTER_SITES=	http://willbarton.com/files/ \
 		http://dryice.name/computer/FreeBSD/distfiles/
@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	trac>=0.11:www/trac
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-graphviz/Makefile b/www/trac-graphviz/Makefile
index b0e715c1eaf4..bb9edda7aaf7 100644
--- a/www/trac-graphviz/Makefile
+++ b/www/trac-graphviz/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	${PYDISTUTILS_PKGNAME:S;^Trac;;S;Plugin$;;:tl}
 PORTVERSION=	0.7.4
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www devel graphics python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -18,7 +18,7 @@ RUN_DEPENDS=	urwfonts>0:x11-fonts/urwfonts \
 		dot:graphics/graphviz \
 		tracd:www/trac
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 PYDISTUTILS_PKGNAME=	graphviz
 NO_ARCH=	yes
diff --git a/www/trac-keywords/Makefile b/www/trac-keywords/Makefile
index 502c1b41a76b..7dd80687889d 100644
--- a/www/trac-keywords/Makefile
+++ b/www/trac-keywords/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	keywords
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/
 PKGNAMEPREFIX=	trac-
@@ -16,7 +16,7 @@ LICENSE=	BSD3CLAUSE
 
 RUN_DEPENDS=	trac>=0.11:www/trac
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 WRKSRC=		${WRKDIR}/trackeywordsplugin/0.11
 NO_ARCH=	yes
diff --git a/www/trac-keywordsecretticket/Makefile b/www/trac-keywordsecretticket/Makefile
index 6904c70f1334..6ae87bf2b680 100644
--- a/www/trac-keywordsecretticket/Makefile
+++ b/www/trac-keywordsecretticket/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	keywordsecretticket
 PORTVERSION=	1.0.1.${GITDATE}
+PORTREVISION=	1
 CATEGORIES=	www devel python
 PKGNAMEPREFIX=	trac-
 
@@ -20,7 +21,7 @@ GH_PROJECT=	trac-keyword-secret-ticket-plugin
 GH_TAGNAME=	98edea2
 GITDATE=	20130401
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-math/Makefile b/www/trac-math/Makefile
index 9815d841ca7e..65ea96451694 100644
--- a/www/trac-math/Makefile
+++ b/www/trac-math/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	math
 PORTVERSION=	0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www math python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -16,7 +16,7 @@ USE_TEX=	latex
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-mercurial/Makefile b/www/trac-mercurial/Makefile
index 20793d8682a9..9a8cde5ed10c 100644
--- a/www/trac-mercurial/Makefile
+++ b/www/trac-mercurial/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	mercurial
 PORTVERSION=	1.0.0.3
+PORTREVISION=	1
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/rm
 PKGNAMEPREFIX=	trac-
@@ -17,7 +18,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 RUN_DEPENDS=	hg:devel/mercurial \
 		tracd:www/trac
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-navadd/Makefile b/www/trac-navadd/Makefile
index e6226536f9f5..8b9939f23b3c 100644
--- a/www/trac-navadd/Makefile
+++ b/www/trac-navadd/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	navadd
 PORTVERSION=	0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -13,7 +13,7 @@ COMMENT=	Plugin for adding navigation items into Trac navigation bars
 
 RUN_DEPENDS=	tracd:www/trac
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
diff --git a/www/trac-pydotorgtheme/Makefile b/www/trac-pydotorgtheme/Makefile
index 6605ce7feada..50257ceb2d60 100644
--- a/www/trac-pydotorgtheme/Makefile
+++ b/www/trac-pydotorgtheme/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pydotorgtheme
 PORTVERSION=	2.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -13,7 +13,7 @@ COMMENT=	Theme that emulates the look of python.org
 RUN_DEPENDS=	tracd:www/trac \
 		trac-themeengine>=2.0:www/trac-themeengine
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/www/trac-scrumburndown/Makefile b/www/trac-scrumburndown/Makefile
index 6d8e814e8ab9..e04a0aff33c5 100644
--- a/www/trac-scrumburndown/Makefile
+++ b/www/trac-scrumburndown/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scrumburndown
 PORTVERSION=	1.9.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
@@ -18,7 +18,7 @@ RUN_DEPENDS=	tracd:www/trac \
 		trac-timingandestimation>=0:www/trac-timingandestimation
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-spam-filter/Makefile b/www/trac-spam-filter/Makefile
index dd2c07b80bd8..11d6db34c6be 100644
--- a/www/trac-spam-filter/Makefile
+++ b/www/trac-spam-filter/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	TracSpamFilter
 PORTVERSION=	0.2.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www devel python
 MASTER_SITES=	http://zhoushuqun.com/files/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -16,7 +16,7 @@ RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}dev
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-subtickets/Makefile b/www/trac-subtickets/Makefile
index 7e199a416f1f..c2a97c506c61 100644
--- a/www/trac-subtickets/Makefile
+++ b/www/trac-subtickets/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	subtickets
 PORTVERSION=	0.2.0.${GITDATE}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	http://distfiles.cse.tw/
 PKGNAMEPREFIX=	trac-
@@ -21,7 +21,7 @@ GH_PROJECT=	trac-subtickets-plugin
 GH_TAGNAME=	a0fc153
 GITDATE=	20130328
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-tags/Makefile b/www/trac-tags/Makefile
index 2ba9c8f4e4b7..9959761ea12c 100644
--- a/www/trac-tags/Makefile
+++ b/www/trac-tags/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tags
 DISTVERSION=	0.7.r${SVN_REV}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -14,7 +14,7 @@ COMMENT=	Generic tags frontend for trac
 
 RUN_DEPENDS=	tracd:www/trac
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-themeengine/Makefile b/www/trac-themeengine/Makefile
index 015ecc6e3ad1..3e5b4ada0b96 100644
--- a/www/trac-themeengine/Makefile
+++ b/www/trac-themeengine/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	themeengine
 PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	trac-
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	tracd:www/trac
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-ticketimport/Makefile b/www/trac-ticketimport/Makefile
index f830360da379..f12e4b2b6f6c 100644
--- a/www/trac-ticketimport/Makefile
+++ b/www/trac-ticketimport/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	ticketimport
 PORTVERSION=	0.7c
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -15,7 +15,7 @@ LICENSE=	BSD3CLAUSE # "same license as trac"
 RUN_DEPENDS=	tracd:www/trac \
 		${PYTHON_PKGNAMEPREFIX}xlrd>=0.7.1:textproc/py-xlrd@${FLAVOR}
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-tickettemplate/Makefile b/www/trac-tickettemplate/Makefile
index 8be1338637fa..39911956c4dd 100644
--- a/www/trac-tickettemplate/Makefile
+++ b/www/trac-tickettemplate/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tickettemplate
 PORTVERSION=	0.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www python
 MASTER_SITES=	http://dist.codelabs.ru/fbsd/trac-${PORTNAME}/
 PKGNAMEPREFIX=	trac-
@@ -14,7 +14,7 @@ COMMENT=	Plugin for making ticket templates
 
 RUN_DEPENDS=	trac>=0.11:www/trac
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-timingandestimation/Makefile b/www/trac-timingandestimation/Makefile
index 9c726a96e54e..412c47c4e51b 100644
--- a/www/trac-timingandestimation/Makefile
+++ b/www/trac-timingandestimation/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	timingandestimation
 PORTVERSION=	1.0.8b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/glarkin
@@ -16,7 +16,7 @@ COMMENT=	Add estimation and time tracking functionality to Trac
 RUN_DEPENDS=	tracd:www/trac
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/branches/trac0.12-Permissions
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-tracdragdrop/Makefile b/www/trac-tracdragdrop/Makefile
index dadd9b90d520..c136c621c3c9 100644
--- a/www/trac-tracdragdrop/Makefile
+++ b/www/trac-tracdragdrop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	tracdragdrop
 PORTVERSION=	0.12.0.10.${SVN_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	http://distfiles.cse.tw/ \
 		http://trac-hacks.org/changeset/${SVN_REV}/tracdragdropplugin?old_path=/&format=zip&filename=/
@@ -20,7 +20,7 @@ RUN_DEPENDS=	tracd:www/trac
 SVN_REV=	12822
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-vote/Makefile b/www/trac-vote/Makefile
index f130a76b83df..1de0d701ee1d 100644
--- a/www/trac-vote/Makefile
+++ b/www/trac-vote/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	vote
 PORTVERSION=	0.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -12,7 +12,7 @@ COMMENT=	Plugin for voting on Trac resources
 
 RUN_DEPENDS=	tracd:www/trac
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-watchlist/Makefile b/www/trac-watchlist/Makefile
index 808a2c98ee9b..3c05c68635f1 100644
--- a/www/trac-watchlist/Makefile
+++ b/www/trac-watchlist/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	watchlist
 PORTVERSION=	1.0.${SVN_REV}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www devel python
 MASTER_SITES=	http://distfiles.cse.tw/ \
 		http://trac-hacks.org/changeset/${SVN_REV}/watchlistplugin?old_path=/&format=zip&filename=/
@@ -20,7 +20,7 @@ RUN_DEPENDS=	tracd:www/trac
 SVN_REV=	11526
 
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/0.12
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-wikitopdf/Makefile b/www/trac-wikitopdf/Makefile
index 65c834e6f297..eaf64467769a 100644
--- a/www/trac-wikitopdf/Makefile
+++ b/www/trac-wikitopdf/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	wikitopdf
 PORTVERSION=	2.2.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www devel python
 MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
@@ -14,7 +14,7 @@ COMMENT=	Plugin to generate PDF documents from the Wiki
 RUN_DEPENDS=	htmldoc:textproc/htmldoc \
 		tracd:www/trac
 
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin
diff --git a/www/trac-wysiwyg/Makefile b/www/trac-wysiwyg/Makefile
index 86777c5aab54..e9be92c80b0a 100644
--- a/www/trac-wysiwyg/Makefile
+++ b/www/trac-wysiwyg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wysiwyg
 DISTVERSION=	0.4.${SVN_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
 		LOCAL/brooks
@@ -15,7 +15,7 @@ COMMENT=	WYSIWYG editor for Trac wiki
 
 RUN_DEPENDS=	tracd:www/trac
 
-USES=		python:2 tar:bzip2
+USES=		python:2.7 tar:bzip2
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/trac-xmlrpc/Makefile b/www/trac-xmlrpc/Makefile
index 30f61fd31d3d..7aa1ace41629 100644
--- a/www/trac-xmlrpc/Makefile
+++ b/www/trac-xmlrpc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xmlrpc
 PORTVERSION=	1.1.2.r${SVN_REV}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/
 PKGNAMEPREFIX=	trac-
@@ -21,7 +21,7 @@ SVN_REV=	13203
 WRKSRC=		${WRKDIR}/${PORTNAME}plugin/trunk
 FETCH_BEFORE_ARGS=	-o ${DISTFILES}
 
-USES=		python:2 zip
+USES=		python:2.7 zip
 USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 
diff --git a/www/uzbl/Makefile b/www/uzbl/Makefile
index eef49dc29389..727ad2e7bb81 100644
--- a/www/uzbl/Makefile
+++ b/www/uzbl/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	uzbl
 PORTVERSION=	0.9.1
 DISTVERSIONPREFIX=v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 
 MAINTAINER=	aehlig@linta.de
@@ -22,7 +22,7 @@ RUN_DEPENDS=	socat:net/socat \
 		dmenu:x11/dmenu \
 		${PYTHON_PKGNAMEPREFIX}configparser>0:devel/py-configparser@${PY_FLAVOR}
 
-USES=		gmake pkgconfig python:2 desktop-file-utils gettext-runtime shebangfix
+USES=		gmake pkgconfig python:2.7 desktop-file-utils gettext-runtime shebangfix
 USE_XORG=	x11
 USE_GNOME=	gtk20 pygtk2 cairo
 USE_LDCONFIG=	yes
diff --git a/www/varnish-libvmod-awsrest/Makefile b/www/varnish-libvmod-awsrest/Makefile
index c3593cfe01d2..79504a0cef3b 100644
--- a/www/varnish-libvmod-awsrest/Makefile
+++ b/www/varnish-libvmod-awsrest/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	rst2man:textproc/py-docutils
 LIB_DEPENDS=	libmhash.so:security/mhash
 
-USES=		autoreconf gmake libtool pkgconfig python:2,build varnish
+USES=		autoreconf gmake libtool pkgconfig python:2.7,build varnish
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 INSTALL_TARGET=	install-strip
diff --git a/www/varnish-libvmod-digest/Makefile b/www/varnish-libvmod-digest/Makefile
index 1b6712f5b7cb..e8d3799317b7 100644
--- a/www/varnish-libvmod-digest/Makefile
+++ b/www/varnish-libvmod-digest/Makefile
@@ -15,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	rst2man:textproc/py-docutils
 LIB_DEPENDS=	libmhash.so:security/mhash
 
-USES=		autoreconf gmake libtool pkgconfig python:2,build varnish
+USES=		autoreconf gmake libtool pkgconfig python:2.7,build varnish
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 INSTALL_TARGET=	install-strip
diff --git a/www/varnish-libvmod-maxminddb/Makefile b/www/varnish-libvmod-maxminddb/Makefile
index 331352332ed0..5a9e260dd1e6 100644
--- a/www/varnish-libvmod-maxminddb/Makefile
+++ b/www/varnish-libvmod-maxminddb/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	rst2man:textproc/py-docutils
 
 LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
 
-USES=		autoreconf gmake libtool pkgconfig python:2,build varnish
+USES=		autoreconf gmake libtool pkgconfig python:2.7,build varnish
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 INSTALL_TARGET=	install-strip
diff --git a/www/varnish-modules/Makefile b/www/varnish-modules/Makefile
index 311cbc129d2e..5d664f18365b 100644
--- a/www/varnish-modules/Makefile
+++ b/www/varnish-modules/Makefile
@@ -13,7 +13,7 @@ LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils
 
-USES=		autoreconf:build gmake libtool pkgconfig python:2,build varnish
+USES=		autoreconf:build gmake libtool pkgconfig python:2.7,build varnish
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 INSTALL_TARGET=	install-strip
diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile
index 801d1af91f36..3a955c942c78 100644
--- a/www/varnish4/Makefile
+++ b/www/varnish4/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre
 CONFLICTS=	varnish-2.* varnish-3.*
 
 USES=		autoreconf cpe gmake libedit libtool ncurses pathfix \
-		pkgconfig python:2,build readline shebangfix
+		pkgconfig python:2.7,build readline shebangfix
 SHEBANG_FILES=	lib/libvcc/vmodtool.py
 CPE_VENDOR=	varnish-cache
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/www/varnish5/Makefile b/www/varnish5/Makefile
index 7127e922b1ae..6bc7ab8dba56 100644
--- a/www/varnish5/Makefile
+++ b/www/varnish5/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libpcre.so:devel/pcre
 CONFLICTS=	varnish-2.* varnish-3.* varnish4-4.*
 
 USES=		autoreconf cpe gmake libedit libtool ncurses pathfix \
-		pkgconfig python:2,build readline shebangfix
+		pkgconfig python:2.7,build readline shebangfix
 SHEBANG_FILES=	lib/libvcc/*.py
 CPE_VENDOR=	varnish-cache
 CFLAGS+=	-I${LOCALBASE}/include
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 42d864ee64de..ff06143db3c7 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	web2ldap
 PORTVERSION=	1.2.94
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.sfr-fresh.com/unix/www/
@@ -18,7 +19,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ldap>=2.4.0:net/py-ldap@${PY_FLAVOR} \
 		${LOCALBASE}/etc/mime.types:misc/mime-support
 
 OPTIONS_DEFINE=	DOCS
-USES=		cpe python:2 shebangfix
+USES=		cpe python:2.7 shebangfix
 python_OLD_CMD=	/usr/bin/python2.7
 SHEBANG_FILES=	sbin/*.py fcgi/*.py
 SUB_FILES=	pkg-message
diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile
index c6d987d6c761..6168c2a11d71 100644
--- a/x11-fm/nemo/Makefile
+++ b/x11-fm/nemo/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	nemo
 PORTVERSION=	2.4.5
+PORTREVISION=	1
 CATEGORIES=	x11-fm gnome
 DIST_SUBDIR=	gnome3
 
@@ -22,7 +23,7 @@ RUN_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 
 USES=		autoreconf:build desktop-file-utils gettext gmake libtool pathfix \
-		pkgconfig python:2 shared-mime-info
+		pkgconfig python:2.7 shared-mime-info
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack introspection:build \
 		libxml2 pygobject3
 USE_GITHUB=	yes
diff --git a/x11-fonts/font-manager/Makefile b/x11-fonts/font-manager/Makefile
index acd6f48004b1..ad969f4c56ed 100644
--- a/x11-fonts/font-manager/Makefile
+++ b/x11-fonts/font-manager/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	font-manager
 PORTVERSION=	0.5.7
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-fonts gnome
 
 MAINTAINER=	portmaster@bsdforge.com
@@ -24,7 +24,7 @@ GH_PROJECT=	master
 
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
-USES=		gmake pkgconfig python:2 tar:bzip2
+USES=		gmake pkgconfig python:2.7 tar:bzip2
 
 PORTDATA=	*
 
diff --git a/x11-fonts/py-bdflib/Makefile b/x11-fonts/py-bdflib/Makefile
index 796f060a36e4..460244b7e7e1 100644
--- a/x11-fonts/py-bdflib/Makefile
+++ b/x11-fonts/py-bdflib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	bdflib
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11-fonts python
 MASTER_SITES=	CHEESESHOP/source/b/${PORTNAME}
@@ -14,7 +15,7 @@ COMMENT=	Library for working with BDF font files
 LICENSE=	GPLv3
 
 NO_ARCH=	yes
-USES=		python:2
+USES=		python:2.7
 USE_PYTHON=	autoplist distutils
 
 post-patch:
diff --git a/x11-toolkits/diorite/Makefile b/x11-toolkits/diorite/Makefile
index 4cc8e6866388..ab39b8b8fbe4 100644
--- a/x11-toolkits/diorite/Makefile
+++ b/x11-toolkits/diorite/Makefile
@@ -14,7 +14,7 @@ BUILD_DEPENDS=	valac:lang/vala
 
 GH_ACCOUNT=	tiliado
 
-# USES=waf implicity does USES=python:2,build but that is not sufficient
+# USES=waf implicity does USES=python:2.7,build but that is not sufficient
 # for shebangfix to know the python version
 USES=		gnome pkgconfig python:2.7,build shebangfix waf
 USE_GITHUB=	yes
diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile
index 8c57587f6555..15d8506a7faf 100644
--- a/x11-toolkits/py-gnome2/Makefile
+++ b/x11-toolkits/py-gnome2/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gnome
 PORTVERSION=	2.28.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-toolkits python gnome
 MASTER_SITES=	GNOME/sources/gnome-python/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ OPTIONS_SUB=	yes
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/ORBit.so:devel/py-orbit@${FLAVOR}
 
-USES=		gettext gmake libtool:keepla pathfix pkgconfig python:2 tar:bzip2
+USES=		gettext gmake libtool:keepla pathfix pkgconfig python:2.7 tar:bzip2
 USE_LDCONFIG=	yes
 USE_GNOME=	libgnomeui pygtk2
 USE_PYTHON=	flavors
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index ca92ca0ded5f..6d684123d30b 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	gtk
 PORTVERSION=	2.24.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-toolkits python
 MASTER_SITES=	GNOME/sources/pygtk/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ COMMENT=	Set of Python bindings for GTK+
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${FLAVOR}
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/cairo/__init__.py:graphics/py-cairo@${FLAVOR}
 
-USES=		gettext gmake libtool pathfix pkgconfig python:2 tar:bzip2
+USES=		gettext gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
 USE_GNOME=	libglade2 pygobject
 USE_PYTHON=	flavors
 GNU_CONFIGURE=	yes
diff --git a/x11-wm/compizconfig-python/Makefile b/x11-wm/compizconfig-python/Makefile
index 35cb1d1ee7af..a07ebdc8eb69 100644
--- a/x11-wm/compizconfig-python/Makefile
+++ b/x11-wm/compizconfig-python/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	compizconfig-python
 PORTVERSION=	0.8.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://releases.compiz.org/${PORTVERSION}/
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	\
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix pkgconfig python:2 tar:bzip2
+USES=		gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
 USE_GNOME=	glib20
 USE_PYTHON=	flavors
 
diff --git a/x11-wm/ede/Makefile b/x11-wm/ede/Makefile
index 637ff95dcbaa..2862fbfb6c14 100644
--- a/x11-wm/ede/Makefile
+++ b/x11-wm/ede/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ede
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF \
 		SF/${PORTNAME}/${PORTNAME}lib/${PORTVERSION}:edelib
@@ -23,7 +23,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libstartup-notification-1.so:x11/startup-notification \
 		libfltk.so:x11-toolkits/fltk
 
-USES=		fam gettext iconv:translit pathfix pkgconfig python:2 \
+USES=		fam gettext iconv:translit pathfix pkgconfig python:2.7 \
 		shared-mime-info shebangfix
 SHEBANG_FILES=	doc/asciidoc/asciidoc.py
 USE_XORG=	xcomposite xft xinerama xkbfile xpm xrandr
diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile
index cc49d8c39f42..a4369d5243c5 100644
--- a/x11-wm/muffin/Makefile
+++ b/x11-wm/muffin/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	muffin
 PORTVERSION=	2.4.4
+PORTREVISION=	1
 CATEGORIES=	x11-wm gnome
 DIST_SUBDIR=	gnome3
 
@@ -19,7 +20,7 @@ LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
 RUN_DEPENDS=	zenity>=3.0.0:x11/zenity
 
 USES=		autoreconf:build gettext libtool gmake \
-		pathfix pkgconfig python:2
+		pathfix pkgconfig python:2.7
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_GNOME=	gconf2 gnomedocutils gnomeprefix gtk30 \
diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile
index b95f7cb19446..10dd72f97b7a 100644
--- a/x11/cinnamon-desktop/Makefile
+++ b/x11/cinnamon-desktop/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	cinnamon-desktop
 PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome3
 
@@ -18,7 +18,7 @@ RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
 
 USE_XORG=	x11 xrandr xext
 USES=		autoreconf gettext gmake libtool localbase:ldflags pathfix \
-		pkgconfig python:2,run shebangfix tar:xz
+		pkgconfig python:2.7,run shebangfix tar:xz
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 USE_GNOME=	gnomeprefix gtk30 intlhack introspection:build
diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile
index f8a45da761b8..9211ba1c2477 100644
--- a/x11/cinnamon-menus/Makefile
+++ b/x11/cinnamon-menus/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	cinnamon-menus
 PORTVERSION=	2.4.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 DIST_SUBDIR=	gnome3
 
@@ -16,7 +17,7 @@ RUN_DEPENDS=	xkeyboard-config>=0:x11/xkeyboard-config \
 		libxkbfile>=0:x11/libxkbfile
 
 USES=		autoreconf gettext gmake libtool pathfix pkgconfig \
-		python:2 tar:xz
+		python:2.7 tar:xz
 USE_GNOME=	gnomemenus3 gnomeprefix gtk30 introspection:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
diff --git a/x11/guake/Makefile b/x11/guake/Makefile
index 77a5a48f3a1f..99e3c38531aa 100644
--- a/x11/guake/Makefile
+++ b/x11/guake/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	guake
 PORTVERSION=	0.8.10
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -44,7 +44,7 @@ PLIST_SUB+=	DESKTOPDIR="${DESKTOPDIR:S,${PREFIX}/,,}"
 
 NO_ARCH=	yes
 USES=		autoreconf:build desktop-file-utils gettext gmake libtool \
-		pkgconfig python:2
+		pkgconfig python:2.7
 USE_GITHUB=	yes
 USE_GNOME=	gtk20 pygnome2 intltool
 
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index b778733dfb20..6dd4480c5283 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	keybinder
 PORTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
 
@@ -36,7 +36,7 @@ LUA_USES=		lua:51
 LUA_CONFIGURE_ON=	--with-lua-includes=${LUA_INCDIR}
 LUA_CONFIGURE_OFF=	--disable-lua
 
-PYTHON_USES=		python:2
+PYTHON_USES=		python:2.7
 PYTHON_USE=		gnome=pygtk2
 PYTHON_CONFIGURE_OFF=	--disable-python
 
diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile
index 6d8cdfc679f1..e0b3e20ef3f4 100644
--- a/x11/plasma-scriptengine-python/Makefile
+++ b/x11/plasma-scriptengine-python/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	plasma-scriptengine-python
 PORTVERSION=	${KDE4_WORKSPACE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde kde-applications
 DISTNAME=	kde-workspace-${PORTVERSION}
 
@@ -10,7 +10,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Plasma scriptengine for Python
 
 NO_ARCH=	yes
-USES=		cmake:outsource kde:4 python:2 tar:xz
+USES=		cmake:outsource kde:4 python:2.7 tar:xz
 USE_KDE=	kdelibs pykde4 automoc4
 USE_QT4=	qmake_build moc_build uic_build rcc_build
 DISTINFO_FILE=	${.CURDIR:H:H}/x11/kde4-workspace/distinfo
diff --git a/x11/xpra/Makefile b/x11/xpra/Makefile
index 2b2f4c42b7b3..d354e4b44bda 100644
--- a/x11/xpra/Makefile
+++ b/x11/xpra/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	xpra
 PORTVERSION=	2.0.3
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11
 MASTER_SITES=	http://xpra.org/src/
 
@@ -37,7 +37,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lz4>=0.7.0_1:archivers/py-lz4@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gtkglext>1:x11-toolkits/py-gtkglext@${FLAVOR} \
 		${PYNUMPY}
 
-USES=		desktop-file-utils fortran gettext-runtime pkgconfig python:2 shared-mime-info shebangfix tar:xz
+USES=		desktop-file-utils fortran gettext-runtime pkgconfig python:2.7 shared-mime-info shebangfix tar:xz
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 pango
 USE_PYTHON=	distutils cython
 USE_XORG=	x11 xcomposite xdamage xext xfixes xkbfile xrandr xtst
author	Antoine Brodin <antoine@FreeBSD.org>	2018-02-19 11:10:43 +0000
committer	Antoine Brodin <antoine@FreeBSD.org>	2018-02-19 11:10:43 +0000
commit	f7455240e3b2acb3cd4804dac9a3afe2582a0a96 (patch)
tree	94eaef37ab07d82e499ae4cafabe202ea2ed0525
parent	6db4531ff6ac4b156bdc1499488964f1c2551e7f (diff)
download	ports-f7455240e3b2acb3cd4804dac9a3afe2582a0a96.tar.gz ports-f7455240e3b2acb3cd4804dac9a3afe2582a0a96.zip