Index: head/archivers/rox-archive/Makefile
===================================================================
--- head/archivers/rox-archive/Makefile	(revision 455912)
+++ head/archivers/rox-archive/Makefile	(revision 455913)
@@ -1,33 +1,33 @@
 # $FreeBSD$
 
 PORTNAME=	rox-archive
 PORTVERSION=	2.3
 PORTREVISION=	1
 CATEGORIES=	archivers
 MASTER_SITES=	SF/rox/Archive/${PORTVERSION}
 DISTNAME=	archive-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Archive management tool for the ROX desktop
 
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib
 
-USES=		python shebangfix tar:bzip2
+USES=		python:2.7 shebangfix tar:bzip2
 NO_ARCH=	yes
 SHEBANG_FILES=	Archive/AppRun
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 pre-install:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 				${WRKSRC}/Archive/findrox.py
 	@${FIND} ${WRKSRC} -name *.bak -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
 	${CP} -r ${WRKSRC}/Archive ${STAGEDIR}${PREFIX}/apps/
 
 .include <bsd.port.mk>
Index: head/audio/decibel-audio-player/Makefile
===================================================================
--- head/audio/decibel-audio-player/Makefile	(revision 455912)
+++ head/audio/decibel-audio-player/Makefile	(revision 455913)
@@ -1,54 +1,53 @@
 # Created by: kipz <somicide@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	decibel-audio-player
 PORTVERSION=	1.08
 PORTREVISION=	5
 CATEGORIES=	audio multimedia gnome python
 MASTER_SITES=	http://decibel.silent-blade.org/uploads/Main/
 
 MAINTAINER=	somicide@gmail.com
 COMMENT=	Fast GTK+ audio player with an clean and user friendly interface
 
-RUN_DEPENDS=	py*-dbus>=0.80:devel/py-dbus \
-		py*-mutagen>=1.11:audio/py-mutagen
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.80:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}mutagen>=1.11:audio/py-mutagen@${PY_FLAVOR}
 
 LICENSE=	GPLv2
 
-USES=		python
 USE_GNOME=	pygnome2 pygtk2
 USE_GSTREAMER=	python good bad
-USES=		gmake gettext desktop-file-utils
+USES=		gmake gettext desktop-file-utils python:2.7
 NO_BUILD=	yes
 
 #Audio gstreamer plugins
 OPTIONS_DEFINE=	AUDIOCD FLAC MP3 MPEG4IP OGG VORBIS SPEEX WAVPACK EXTRAS
 OPTIONS_DEFAULT=	AUDIOCD FLAC MP3 MPEG4IP OGG VORBIS WAVPACK EXTRAS
 AUDIOCD_DESC=	AudioCD support
 MPEG4IP_DESC=	AAC/MP4P support
 #
 ##A few extra requirements if we want to use some nifty plugins in decibel
 EXTRAS_DESC=	Extra dependencies for plugins
 
 AUDIOCD_RUN_DEPENDS=	cd-discid>=0.9:audio/cd-discid \
-		py*-cddb>=1.4:audio/py-cddb \
+		${PYTHON_PKGNAMEPREFIX}cddb>=1.4:audio/py-cddb@${PY_FLAVOR} \
 		gstreamer-plugins-cdio>=0.10.16:sysutils/gstreamer-plugins-cdio
-EXTRAS_RUN_DEPENDS=	py*-pillow>0:graphics/py-pillow \
-		py*-notify>=0.1.1:devel/py-notify
+EXTRAS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}notify>=0.1.1:devel/py-notify@${PY_FLAVOR}
 FLAC_USE=	GSTREAMER=flac
 MP3_USE=	GSTREAMER=mp3
 MPEG4IP_LIB_DEPENDS=	libmp4v2.so:multimedia/mp4v2
 MPEG4IP_USE=	GSTREAMER=faad
 OGG_USE=	GSTREAMER=ogg
 SPEEX_USE=	GSTREAMER=speex
 VORBIS_USE=	GSTREAMER=vorbis
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_USE=	GSTREAMER=wavpack
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|prefix|${PREFIX}|g' \
 		${WRKSRC}/start.sh ${WRKSRC}/start-remote.sh
 
 .include <bsd.port.mk>
Index: head/audio/dir2ogg/Makefile
===================================================================
--- head/audio/dir2ogg/Makefile	(revision 455912)
+++ head/audio/dir2ogg/Makefile	(revision 455913)
@@ -1,41 +1,41 @@
 # Created by: chinsan
 # $FreeBSD$
 
 PORTNAME=	dir2ogg
 PORTVERSION=	0.12
 PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	http://jak-linux.org/projects/dir2ogg/${PORTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command-line {wav,mp3,m4a} to ogg converter
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	faad:audio/faad \
-		mutagen-inspect:audio/py-mutagen \
+		${PYTHON_PKGNAMEPREFIX}mutagen>=0:audio/py-mutagen@${PY_FLAVOR} \
 		mplayer:multimedia/mplayer \
 		oggenc:audio/vorbis-tools
 
 USES=		python:2,run shebangfix
 
 SHEBANG_FILES=	${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PORTDOCS=	NEWS README
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/audio/solfege/Makefile
===================================================================
--- head/audio/solfege/Makefile	(revision 455912)
+++ head/audio/solfege/Makefile	(revision 455913)
@@ -1,49 +1,49 @@
 # Created by: ijliao
 # $FreeBSD$
 #   $MCom: ports/audio/solfege/Makefile,v 1.7 2007/09/09 23:47:50 mezz Exp $
 
 PORTNAME=	solfege
 PORTVERSION=	3.22.2
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION}
 PKGNAMESUFFIX=	-nosound
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Free ear training software
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
 		txt2man:textproc/txt2man
 
-USES=		gettext gmake makeinfo pathfix pkgconfig python shebangfix
+USES=		gettext gmake makeinfo pathfix pkgconfig python:2.7 shebangfix
 SHEBANG_FILES=	exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_XML2PO=""
 CONFIGURE_ARGS=	--disable-oss-sound \
 		--enable-docbook-stylesheet=${STYLESHEET}
 MAKE_ARGS=	nopycompile=YES skipmanual=yes
 NO_ARCH=	yes
 
 # Restrict to stable (even) versions, indicated by the second component.
 PORTSCOUT=	limitw:1,even
 
 STYLESHEET=	${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|cp --parents|${PAX} -rw|' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|type=sequencer-device|type=fake-synth| ; \
 		 s|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/default.config
 	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|.*\(#!\).*|\1${PYTHON_CMD}|'
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
 		-d ${PREFIX} -f ${DATADIR_REL})
 
 .include <bsd.port.mk>
Index: head/deskutils/ganyremote/Makefile
===================================================================
--- head/deskutils/ganyremote/Makefile	(revision 455912)
+++ head/deskutils/ganyremote/Makefile	(revision 455913)
@@ -1,35 +1,35 @@
 # Created by: Alexander Logvinov <ports@logvinov.com>
 # $FreeBSD$
 
 PORTNAME=	ganyremote
 PORTVERSION=	6.3.3
 PORTREVISION=	1
 CATEGORIES=	deskutils comms gnome
 MASTER_SITES=	SF/anyremote/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME frontend for anyRemote
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	anyremote:comms/anyremote
 
-USES=		gettext python shebangfix
+USES=		gettext python:2.7 shebangfix
 SHEBANG_FILES=	ganyremote
 USE_GNOME=	pygtk2
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/local|${LOCALBASE}| ; \
 		 /usepybluez = /s|True|False| ; \
 		 /initVerify()$$/d' ${WRKSRC}/${PORTNAME}
 	@${REINPLACE_CMD} -e \
 		'/DESTDIR/s|cp -r|cp -R| ; \
 		 /DESTDIR/s|COPYING||' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: head/deskutils/rox-memo/Makefile
===================================================================
--- head/deskutils/rox-memo/Makefile	(revision 455912)
+++ head/deskutils/rox-memo/Makefile	(revision 455913)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	rox-memo
 PORTVERSION=	2.1
 PORTREVISION=	2
 CATEGORIES=	deskutils
 MASTER_SITES=	SF/rox/Memo/${PORTVERSION}
 DISTNAME=	memo-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Appointment/TODO management for the ROX desktop
 
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib
 
-USES=		python shebangfix tar:bzip2
+USES=		python:2.7 shebangfix tar:bzip2
 SHEBANG_FILES=	Memo/AppRun Memo/AppletRun
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 pre-install:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 				${WRKSRC}/Memo/findrox.py
 	@${FIND} ${WRKSRC} -name *.bak -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
 	${CP} -r ${WRKSRC}/Memo ${STAGEDIR}${PREFIX}/apps/
 
 .include <bsd.port.mk>
Index: head/devel/gtkparasite/Makefile
===================================================================
--- head/devel/gtkparasite/Makefile	(revision 455912)
+++ head/devel/gtkparasite/Makefile	(revision 455913)
@@ -1,31 +1,31 @@
 # Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	gtkparasite
 PORTVERSION=	20090819
 PORTREVISION=	6
 CATEGORIES=	devel
 MASTER_SITES=	LOCAL/pav
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	GTK+ UI debugging tool
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 INSTALL_TARGET=	install-strip
-USES=		autoreconf libtool pkgconfig python
+USES=		autoreconf libtool pkgconfig python:2.7
 USE_GNOME=	gtk20 pygtk2
 WRKSRC=		${WRKDIR}/chipx86-gtkparasite-a3d862d4a91ea27222e4273a6797f3e47efe6e83
 PORTDOCS=	USAGE
 PLIST_FILES=	lib/gtk-2.0/modules/libgtkparasite.so
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/USAGE ${STAGEDIR}/${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/devel/libhid/Makefile
===================================================================
--- head/devel/libhid/Makefile	(revision 455912)
+++ head/devel/libhid/Makefile	(revision 455913)
@@ -1,25 +1,25 @@
 # Created by: ntarmos@ceid.upatras.gr
 # $FreeBSD$
 
 PORTNAME=	libhid
 PORTVERSION=	0.2.16
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/1958/
 
 MAINTAINER=	ntarmos@cs.uoi.gr
 COMMENT=	User-space HID access library written in C
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/xsltproc:textproc/libxslt \
 		docbook-xsl>0:textproc/docbook-xsl \
 		${LOCALBASE}/bin/swig1.3:devel/swig13
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-doxygen --disable-werror
 INSTALL_TARGET=	install-strip
-USES=		gmake libtool pathfix python
+USES=		gmake libtool pathfix python:2.7
 USE_LDCONFIG=	yes
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-usb
 
 .include <bsd.port.mk>
Index: head/editors/rox-edit/Makefile
===================================================================
--- head/editors/rox-edit/Makefile	(revision 455912)
+++ head/editors/rox-edit/Makefile	(revision 455913)
@@ -1,35 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	rox-edit
 PORTVERSION=	2.2
 PORTREVISION=	1
 CATEGORIES=	editors
 MASTER_SITES=	SF/rox/Edit/${PORTVERSION}
 DISTNAME=	edit-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Text editor for the ROX desktop
 
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib
 
-USES=		python tar:bzip2
+USES=		python:2.7 tar:bzip2
 
 post-extract:
 	@${FIND} ${WRKSRC} -name .cvsignore | ${XARGS} ${RM}
 	@${FIND} ${WRKSRC} -name CVS | ${XARGS} ${RM} -r
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 pre-install:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 			${WRKSRC}/Edit/findrox.py
 	@${FIND} ${WRKSRC} -name *.bak | ${XARGS} ${RM}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
 	${CP} -r ${WRKSRC}/Edit ${STAGEDIR}${PREFIX}/apps/
 
 .include <bsd.port.mk>
Index: head/emulators/swine/Makefile
===================================================================
--- head/emulators/swine/Makefile	(revision 455912)
+++ head/emulators/swine/Makefile	(revision 455913)
@@ -1,57 +1,56 @@
 # Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	swine
 PORTVERSION=	1.0.4
 PORTREVISION=	1
 CATEGORIES=	emulators deskutils python
 
 MAINTAINER=	koalative@gmail.com
 COMMENT=	Qt4 graphical Wine frontend
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	pyrcc4:textproc/py-qt4-xml
 RUN_DEPENDS=	xterm:x11/xterm \
 		cabextract:archivers/cabextract \
-		icotool:graphics/icoutils \
-		${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui
+		icotool:graphics/icoutils
 
 DATADIRLIB=	${PREFIX}/lib/${PORTNAME}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dswd
 GH_PROJECT=	Swine
 
-USES=		gmake python:2.7
+USES=		gmake python:2.7 pyqt:4
 NO_BUILD=	yes
+USE_PYQT=	gui_run xml_build
 USE_QT4=	linguist_build
 ONLY_FOR_ARCHS=	i386 amd64
 
 PORTDOCS=	README
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 RUN_DEPENDS+=	wine:emulators/wine-devel
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' ${WRKSRC}/version.sh
 	@${REINPLACE_CMD} -e 's|/usr|${PREFIX}| ; \
 			s|swine32.png|*| ; \
 			s|lrelease-qt4|lrelease|' \
 	${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|/usr/share/swine/images/swine32.png|swine|' \
 		-e 's|^Categories=.*|Categories=Wine;System;Emulator;Utility;Game;|' \
 		${WRKSRC}/resources/swine.desktop
 
 post-install:
 	${LN} -sf ${DATADIR}/images/swine32.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/emulators/xen-kernel/Makefile
===================================================================
--- head/emulators/xen-kernel/Makefile	(revision 455912)
+++ head/emulators/xen-kernel/Makefile	(revision 455913)
@@ -1,112 +1,112 @@
 # $FreeBSD$
 
 PORTNAME=	xen
 PORTVERSION=	4.7.2
 PORTREVISION=	7
 CATEGORIES=	emulators
 MASTER_SITES=	http://downloads.xenproject.org/release/xen/${PORTVERSION}/
 PKGNAMESUFFIX=	-kernel
 
 MAINTAINER=	royger@FreeBSD.org
 COMMENT=	Hypervisor using a microkernel design
 
 LICENSE=	GPLv2
 
 ONLY_FOR_ARCHS=	amd64
 
-USES=		cpe gmake python:build
+USES=		cpe gmake python:2.7,build
 
 # We need to use ld from ports because the version in base doesn't
 # support the '--build-id' switch that's needed for live hypervisor
 # hot-patching. Once the ld version in base supports this option the
 # dependency can be removed.
 #
 # GNU objcopy is used instead of elftc objcopy because of bug #533:
 # https://sourceforge.net/p/elftoolchain/tickets/533/
 # Once this is solved we should be able to switch to elfcopy.
 #
 # And finally we also need to use nm from binutils because the one
 # from base cannot deal with i386pep binary files which is the format
 # of the Xen EFI image (note that FreeBSD cannot yet boot as Dom0 from EFI,
 # but the image is built anyway). This is reported to elftc as bug #534:
 # https://sourceforge.net/p/elftoolchain/tickets/534/
 MAKE_ARGS=	clang=y PYTHON=${PYTHON_CMD} LD="${LD}" OBJCOPY="${OBJCOPY}" \
 		NM="${NM}"
 USE_BINUTILS=	yes
 NO_MTREE=	yes
 STRIP=		#
 PLIST_FILES=	/boot/xen \
 		/boot/xen.4th
 EXTRA_PATCHES=	${FILESDIR}/0001-xen-logdirty-prevent-preemption-if-finished.patch:-p1 \
 		${FILESDIR}/0002-xen-rework-paging_log_dirty_op-to-work-with-hvm-gues.patch:-p1 \
 		${FILESDIR}/kconf_arch.patch:-p1 \
 		${FILESDIR}/0001-x86-drop-unneeded-__packed-attributes.patch:-p1 \
 		${FILESDIR}/0002-build-clang-fix-XSM-dummy-policy-when-using-clang-4..patch:-p1 \
 		${FILESDIR}/xsa212.patch:-p1 \
 		${FILESDIR}/xsa213-4.7.patch:-p1 \
 		${FILESDIR}/xsa214.patch:-p1 \
 		${FILESDIR}/xsa215.patch:-p1 \
 		${FILESDIR}/xsa217.patch:-p1 \
 		${FILESDIR}/0001-IOMMU-handle-IOMMU-mapping-and-unmapping-failures.patch:-p1 \
 		${FILESDIR}/0002-gnttab-fix-unmap-pin-accounting-race.patch:-p1 \
 		${FILESDIR}/0003-gnttab-Avoid-potential-double-put-of-maptrack-entry.patch:-p1 \
 		${FILESDIR}/0004-gnttab-correct-maptrack-table-accesses.patch:-p1 \
 		${FILESDIR}/xsa219-4.8.patch:-p1 \
 		${FILESDIR}/xsa220-4.7.patch:-p1 \
 		${FILESDIR}/xsa221.patch:-p1 \
 		${FILESDIR}/xsa222-1-4.7.patch:-p1 \
 		${FILESDIR}/xsa222-2-4.7.patch:-p1 \
 		${FILESDIR}/0001-gnttab-Fix-handling-of-dev_bus_addr-during-unmap.patch:-p1 \
 		${FILESDIR}/0002-gnttab-never-create-host-mapping-unless-asked-to.patch:-p1 \
 		${FILESDIR}/0003-gnttab-correct-logic-to-get-page-references-during-m.patch:-p1 \
 		${FILESDIR}/0004-gnttab-__gnttab_unmap_common_complete-is-all-or-noth.patch:-p1 \
 		${FILESDIR}/xsa226-4.7.patch:-p1 \
 		${FILESDIR}/xsa227.patch:-p1 \
 		${FILESDIR}/xsa228-4.8.patch:-p1 \
 		${FILESDIR}/xsa230.patch:-p1 \
 		${FILESDIR}/xsa231-4.7.patch:-p1 \
 		${FILESDIR}/xsa232.patch:-p1 \
 		${FILESDIR}/xsa233.patch:-p1 \
 		${FILESDIR}/xsa234-4.8.patch:-p1 \
 		${FILESDIR}/0001-x86-dont-allow-MSI-pIRQ-mapping-on-unowned-device.patch:-p1 \
 		${FILESDIR}/0002-x86-enforce-proper-privilege-when-mapping-pIRQ-s.patch:-p1 \
 		${FILESDIR}/0003-x86-MSI-disallow-redundant-enabling.patch:-p1 \
 		${FILESDIR}/0004-x86-IRQ-conditionally-preserve-irq-pirq-mapping-on-error.patch:-p1 \
 		${FILESDIR}/0005-x86-FLASK-fix-unmap-domain-IRQ-XSM-hook.patch:-p1 \
 		${FILESDIR}/xsa238.patch:-p1 \
 		${FILESDIR}/xsa239.patch:-p1 \
 		${FILESDIR}/0001-x86-limit-linear-page-table-use-to-a-single-level.patch:-p1 \
 		${FILESDIR}/0002-x86-mm-Disable-PV-linear-pagetables-by-default.patch:-p1 \
 		${FILESDIR}/xsa241-4.8.patch:-p1 \
 		${FILESDIR}/xsa242-4.9.patch:-p1 \
 		${FILESDIR}/xsa243-4.7.patch:-p1 \
 		${FILESDIR}/xsa244-4.7.patch:-p1 \
 		${FILESDIR}/xsa236-4.9.patch:-p1
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} != FreeBSD
 IGNORE=		only supported on FreeBSD
 .endif
 
 .if ${OSVERSION} < 1100055
 IGNORE=		only supported on recent FreeBSD 11
 .endif
 
 pre-build:
 	${MAKE_CMD} -C ${WRKSRC}/xen defconfig ${MAKE_ARGS}
 	# Enable hypervisor hot-patching.
 	echo 'CONFIG_XSPLICE=y' >> ${WRKSRC}/xen/.config
 	echo 'CONFIG_FAST_SYMBOL_LOOKUP=y' >> ${WRKSRC}/xen/.config
 
 # The ports native 'build' target cannot be used because it sets
 # CFLAGS, and that breaks the Xen build system.
 do-build:
 	${MAKE_CMD} -j${MAKE_JOBS_NUMBER} -C ${WRKSRC}/xen build ${MAKE_ARGS}
 
 do-install:
 	${MKDIR} ${STAGEDIR}/boot
 	${INSTALL_PROGRAM} ${WRKSRC}/xen/xen ${STAGEDIR}/boot
 	${INSTALL_DATA} ${FILESDIR}/xen.4th ${STAGEDIR}/boot
 
 .include <bsd.port.mk>
Index: head/games/kajongg/Makefile
===================================================================
--- head/games/kajongg/Makefile	(revision 455912)
+++ head/games/kajongg/Makefile	(revision 455913)
@@ -1,24 +1,24 @@
 # $FreeBSD$
 
 PORTNAME=	kajongg
 PORTVERSION=	${KDE4_VERSION}
 PORTREVISION=	4
 CATEGORIES=	games kde kde-kde4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	${${PORTNAME}_DESC}
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR}
 
 NO_ARCH=	yes
-USES=		cmake:outsource kde:4 python tar:xz shebangfix sqlite
+USES=		cmake:outsource kde:4 python:2.7 tar:xz shebangfix sqlite
 USE_KDE=	kdelibs pykde4 automoc4
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 CMAKE_ARGS=	-DINSTALL_KAJONGG:BOOL=TRUE
 
 SHEBANG_FILES=	src/kajongg.py \
 		src/kajonggserver.py \
 		src/kajonggtest.py
 
 .include <${.CURDIR}/../kdegames4/Makefile.common>
 .include <bsd.port.mk>
Index: head/games/magicor/Makefile
===================================================================
--- head/games/magicor/Makefile	(revision 455912)
+++ head/games/magicor/Makefile	(revision 455913)
@@ -1,69 +1,69 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	magicor
 PORTVERSION=	1.1
 PORTREVISION=	9
 CATEGORIES=	games
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-source-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-data-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Old-school, puzzle game similar to Solomon's Key
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/pygame/__init__.py:devel/py-game
+RUN_DEPENDS=	${PYGAME}
 
 USES=		python:2.7 shebangfix
 SHEBANG_FILES=	*.py
 NO_BUILD=	yes
 NO_ARCH=	yes
 
 PORTDOCS=	*
 PORTDATA=	*
 
 DESKTOP_ENTRIES="Magicor" \
 		"Old-school, puzzle game similar to Solomon's Key" \
 		"" \
 		"${PORTNAME}" \
 		"Game;LogicGame;" \
 		false
 
 OPTIONS_DEFINE=	EDITOR DOCS
 OPTIONS_DEFAULT=EDITOR
 OPTIONS_SUB=	yes
 
 EDITOR_DESC=	Enable editor
-EDITOR_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:x11-toolkits/py-gtk2
+EDITOR_USE=	gnome=pygtk2
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|###CONFIG_PATH###|${PREFIX}/etc/magicor/magicor.conf|' \
 		${WRKSRC}/Magicor.py
 	@${REINPLACE_CMD} -e 's|###CONFIG_PATH###|${PREFIX}/etc/magicor/magicor-editor.conf|' \
 		${WRKSRC}/Magicor-LevelEditor.py
 	@${REINPLACE_CMD} -e '1,1 s|/usr/bin/python|/usr/bin/env python|' \
 		${WRKSRC}/Magicor.py ${WRKSRC}/Magicor-LevelEditor.py
 	@${REINPLACE_CMD} -e 's|###SHARE_PATH###|${DATADIR}|' ${WRKSRC}/etc/*.conf
 	@${FIND} ${WRKSRC}/magicor -name "*.pyc" -delete
 
 do-install:
 	@cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/
 	@cd ${WRKSRC}/magicor && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/magicor/
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/magicor
 	${INSTALL_SCRIPT} ${WRKSRC}/Magicor.py ${STAGEDIR}${PREFIX}/bin/magicor
 	${INSTALL_DATA} ${WRKSRC}/etc/magicor.conf \
 		${STAGEDIR}${PREFIX}/etc/magicor/magicor.conf.sample
 
 do-install-EDITOR-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/Magicor-LevelEditor.py ${STAGEDIR}${PREFIX}/bin/magicor-editor
 	${INSTALL_DATA} ${WRKSRC}/etc/magicor-editor.conf \
 		${STAGEDIR}${PREFIX}/etc/magicor/magicor-editor.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
Index: head/games/openalchemist/Makefile
===================================================================
--- head/games/openalchemist/Makefile	(revision 455912)
+++ head/games/openalchemist/Makefile	(revision 455913)
@@ -1,43 +1,43 @@
 # Created by: Ganael LAPLANCHE <ganael.laplanche@martymac.org>
 # $FreeBSD$
 
 PORTNAME=	openalchemist
 PORTVERSION=	0.3
 PORTREVISION=	20
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	Tetris-like game
 
 LICENSE=	GPLv2+ CC-BY-SA-2.0
 LICENSE_COMB=	multi
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	zip:archivers/zip
 LIB_DEPENDS=	libclanCore.so:devel/clanlib1 \
 		libpng.so:graphics/png
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 GNU_CONFIGURE=	yes
 USE_GNOME=	pygtk2
 USE_XORG=	xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice
 USE_GL=		gl glu
 USE_SDL=	sdl gfx
-USES=		autoreconf gmake iconv jpeg pkgconfig python:run shebangfix
+USES=		autoreconf gmake iconv jpeg pkgconfig python:2.7,run shebangfix
 SHEBANG_FILES=	openalchemist-config
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
 
 post-patch:
 	@${REINPLACE_CMD} -E -e 's|0.8|1.0|g' -e 's|^%|#|g' ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -E -e 's|0.8|1.0|g' ${WRKSRC}/build/Makefile.am
 	@${REINPLACE_CMD} -E -e 's|^dist_pkgdata_DATA =.*|dist_pkgdata_DATA = data/* skins/aqua.zip skins/brushed.zip skins/vectoriel.zip|g' ${WRKSRC}/Makefile.am
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/graphics/gimp-ez-perspective-plugin/Makefile
===================================================================
--- head/graphics/gimp-ez-perspective-plugin/Makefile	(revision 455912)
+++ head/graphics/gimp-ez-perspective-plugin/Makefile	(revision 455913)
@@ -1,46 +1,46 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	ez-perspective
 PORTVERSION=	0.1.2
 PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	http://registry.gimp.org/files/
 PKGNAMEPREFIX=	gimp-
 PKGNAMESUFFIX=	-plugin
 DISTNAME=	${PORTNAME}.py
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GIMP plugin to sharpen by increasing contrast in high frequency space
 
 LICENSE=	EZPERSPECTIVE
 LICENSE_NAME=	End User License Agreement
 LICENSE_FILE=	${FILESDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 LICENSE_DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gimp-2.0.pc:graphics/gimp-app \
 		${LOCALBASE}/libexec/gimp/2.2/python/gimpfu.py:graphics/py-gimp
 
-USES=		python:run zip
+USES=		python:2.7,run zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
 PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
 
 # installed files
 PLIST_FILES=	${PLUGIN_DIR}/${DISTNAME}
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/usr/bin/python|${PYTHON_CMD}|' \
 		${WRKSRC}/${DISTNAME}
 
 do-install:
 # plugin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \
 		${STAGEDIR}${PREFIX}/${PLUGIN_DIR}
 
 .include <bsd.port.mk>
Index: head/graphics/gimp-resynthesizer/Makefile
===================================================================
--- head/graphics/gimp-resynthesizer/Makefile	(revision 455912)
+++ head/graphics/gimp-resynthesizer/Makefile	(revision 455913)
@@ -1,42 +1,42 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	resynthesizer
 PORTVERSION=	2.0.1
 PORTREVISION=	4
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	gimp-
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Gimp plug-in for texture synthesis
 
 LICENSE=	GPLv2+ # though COPYING has GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/gimp/2.2/python/gimpfu.py:graphics/py-gimp
 BUILD_DEPENDS=	intltool-extract:textproc/intltool
 LIB_DEPENDS=	libgimp-2.0.so:graphics/gimp-app
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bootchk
 
-USES=		autoreconf compiler:nestedfct gettext gmake localbase pkgconfig python:run shebangfix
+USES=		autoreconf compiler:nestedfct gettext gmake localbase pkgconfig python:2.7,run shebangfix
 SHEBANG_FILES=	PluginScripts/*.py
 GNU_CONFIGURE=	yes
 
 PLUGIN_DIR?=	libexec/gimp/2.2/plug-ins
 PLIST_SUB=	PLUGIN_DIR=${PLUGIN_DIR}
 
 OPTIONS_DEFINE=	THREADS
 THREADS_DESC=	Threading support (produces nondeterministic results)
 THREADS_LIBS=	`pkg-config --libs gthread-2.0`
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(GIMP_LIBDIR=\).*|\1"$${prefix}/${PLUGIN_DIR:H}"|; \
 		s|^\(gimpplugindir=\).*|\1"$$GIMP_LIBDIR"|' ${WRKSRC}/configure.ac
 
 post-patch-THREADS-off:
 	@${REINPLACE_CMD} -e '/^#define SYNTH_THREADED/ d' \
 		${WRKSRC}/lib/buildSwitches.h
 
 .include <bsd.port.mk>
Index: head/irc/py-supybot-plugins/Makefile
===================================================================
--- head/irc/py-supybot-plugins/Makefile	(revision 455912)
+++ head/irc/py-supybot-plugins/Makefile	(revision 455913)
@@ -1,31 +1,31 @@
 # Created by: Radim Kolar
 # $FreeBSD$
 
 PORTNAME=	supybot-plugins
 PORTVERSION=	20060723
 PORTREVISION=	1
 CATEGORIES=	irc python
 MASTER_SITES=	SF/supybot/OldFiles
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Supybot-plugins-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Official plugin pack for Supybot
 
-RUN_DEPENDS=	supybot:irc/py-supybot
+RUN_DEPENDS=	supybot:irc/py-supybot@${PY_FLAVOR}
 
-USES=		python tar:bzip2
+USES=		python:2.7 tar:bzip2
 
 post-extract:
 # Delete, because it now included in irc/py-supybot
 .for data in BadWords Dunno Success _darcs
 	@${RM} -r ${WRKSRC}/${data}
 .endfor
 
 do-build:
 	cd ${WRKSRC} && ${PYTHON_CMD} -c 'import compileall;compileall.compile_dir(".");' && ${PYTHON_CMD} -O -c 'import compileall;compileall.compile_dir(".");'
 
 do-install:
 	cd ${WRKSRC} && ${FIND} . | ${CPIO} -pdm -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/supybot/plugins
 
 .include <bsd.port.mk>
Index: head/math/qtiplot/Makefile
===================================================================
--- head/math/qtiplot/Makefile	(revision 455912)
+++ head/math/qtiplot/Makefile	(revision 455913)
@@ -1,93 +1,92 @@
 # Created by: Jie Gao <gaoj@cpsc.ucalgary.ca>
 # $FreeBSD$
 
 PORTNAME=	qtiplot
 DISTVERSION=	0.9.8.9
 PORTREVISION=	13
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Data analysis and scientific plotting
 
 LIB_DEPENDS=	libgsl.so:math/gsl \
 		libmuparser.so:math/muparser \
 		libpng.so:graphics/png
 # use bundled modified libraries
 #		qwt.5:x11-toolkits/qwt5 \
 #		qwtplot3d-qt4:math/qwtplot3d-qt4
 
 USES=		dos2unix gmake qmake tar:bzip2
 USE_QT4=	gui opengl svg qt3support network assistantclient \
 		moc_build rcc_build
 USE_GL=		glu
 QMAKE_ARGS+=	LOCALBASE=${LOCALBASE} PYTHON_CMD=${PYTHON_CMD}
 DOS2UNIX_GLOB=	*.pro
 
 DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
 		"${PREFIX}/share/pixmaps/qtiplot.png" \
 		"qtiplot" "" true
 
 OPTIONS_DEFINE=	DOCS PYTHON NLS DEBUG
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=	yes
 
 DOCS_DESC=	Install the QtiPlot Handbook
 DOCS_RUN_DEPENDS=	qtiplot-doc>=0:math/qtiplot-doc
 DOCS_USE=	QT4=assistant-adp_run
 
 PYTHON_DESC=	Python scripting support
-PYTHON_USES=	python:2.7
-PYTHON_BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui
-PYTHON_RUN_DEPENDS=	${PYTHON_BUILD_DEPENDS}
+PYTHON_USES=	pyqt:4 python:2.7
+PYTHON_USE=	pyqt=gui
 PYTHON_CONFIGURE_ENV=	PYTHON_INCLUDEDIR=${PYTHON_INCLUDEDIR} \
 			PYTHON_VERSION=${PYTHON_VERSION}
 
 NLS_USE=	QT4=linguisttools_build
 
 post-extract:
 	${CP} ${FILESDIR}/build.conf ${WRKSRC}
 
 post-patch:
 	${REINPLACE_CMD} -e \
 		's|/usr/local/qtiplot/fitPlugins|${DATADIR}/fitPlugins|' \
 		${WRKSRC}/qtiplot/src/core/ApplicationWindow.cpp
 	${REINPLACE_CMD} -e \
 		's|target.path=.*|target.path=${DATADIR}/fitPlugins|g' \
 		${WRKSRC}/fitPlugins/*/*.pro
 	${REINPLACE_CMD} -e '/^system($$$$LUPDATE/d; /^system($$$$LRELEASE/d' \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 
 post-patch-PYTHON-on:
 	${REINPLACE_CMD} -e \
 		'/^sys.path.append/s|"\."|"${DATADIR}"|' \
 		${WRKSRC}/${PORTNAME}/qtiplotrc.py
 
 post-patch-PYTHON-off:
 	${REINPLACE_CMD} -e \
 		"s/SCRIPTING_LANGS.*Python//" \
 		${WRKSRC}/build.conf
 
 post-patch-DEBUG-on:
 	${REINPLACE_CMD} -e \
 		"/^CONFIG.*release/s|release|debug|" \
 		${WRKSRC}/build.conf
 
 post-patch-NLS-off:
 	${REINPLACE_CMD} -e \
 		"/INSTALLS.*translations/d" \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 
 pre-configure-NLS-on:
 	cd ${WRKSRC}/qtiplot && ${LRELEASE} -compress qtiplot.pro
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/qtiplot.png
 
 post-install-PYTHON-on:
 .for s in qtiplotrc.py qtiUtil.py
 	cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')"
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${STAGEDIR}${DATADIR}/${s}c
 .endfor
 
 .include <bsd.port.mk>
Index: head/misc/gonvert/Makefile
===================================================================
--- head/misc/gonvert/Makefile	(revision 455912)
+++ head/misc/gonvert/Makefile	(revision 455913)
@@ -1,49 +1,49 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gonvert
 PORTVERSION=	0.2.38
 CATEGORIES=	misc python gnome
 MASTER_SITES=	http://www.unihedron.com/projects/gonvert/downloads/
 
 MAINTAINER=	nemysis@FreeBSD.org
 COMMENT=	Conversion utility that allows conversion between many units
 
 LICENSE=	GPLv2
 
 USE_GNOME=	pygtk2
-USES=		python
+USES=		python:2.7
 NO_BUILD=	yes
 
 PORTDOCS=	CHANGELOG FAQ README THANKS
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|#!/usr/bin/python|#!/usr/bin/env python|g ; \
 		 s|/usr/share|${PREFIX}/share|g ; \
 		 s|/\.\./pixmaps/|/pixmaps/|g' ${WRKSRC}/gonvert
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.glade ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/pixmaps/*.png ${STAGEDIR}${DATADIR}/pixmaps/
 	${LN} -sf ${DATADIR}/pixmaps/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/pl/LC_MESSAGES
 	${INSTALL_DATA} ${WRKSRC}/i18n/pl_messages.gmo \
 		${STAGEDIR}${PREFIX}/share/locale/pl/LC_MESSAGES/gonvert.mo
 
 .include <bsd.port.mk>
Index: head/multimedia/gstreamer1-libav/Makefile
===================================================================
--- head/multimedia/gstreamer1-libav/Makefile	(revision 455912)
+++ head/multimedia/gstreamer1-libav/Makefile	(revision 455913)
@@ -1,37 +1,37 @@
 # Created by: Koop Mast <kwm@rainbow-runner.nl>
 # $FreeBSD$
 
 PORTNAME=	gstreamer1-libav
 PORTVERSION=	1.12.3
 PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://gstreamer.freedesktop.org/src/gst-libav/
 DISTNAME=	gst-libav-${PORTVERSION}
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	GStreamer plug-in with many audio/video decoders/encoders
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	orc>=0.4.16:devel/orc
 LIB_DEPENDS=	liborc-0.4.so:devel/orc \
 		libavcodec.so:multimedia/ffmpeg
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:features gettext-runtime gmake libtool localbase \
-		pkgconfig tar:xz
+		pkgconfig python:build tar:xz
 USE_LDCONFIG=	yes
 USE_GSTREAMER1=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-system-libav
 
 INSTALL_TARGET=	install-strip
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-Werror||g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/multimedia/rox-videothumbnail/Makefile
===================================================================
--- head/multimedia/rox-videothumbnail/Makefile	(revision 455912)
+++ head/multimedia/rox-videothumbnail/Makefile	(revision 455913)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	rox-videothumbnail
 PORTVERSION=	0.1.14
 PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.kerofin.demon.co.uk/rox/
 DISTNAME=	VideoThumbnail-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Video thumbnail provider for the ROX file manager
 
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib
 
 WRKSRC=		${WRKDIR}/VideoThumbnail
 
-USES=		python
+USES=		python:2.7
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
 	${CP} -r ${WRKSRC} ${STAGEDIR}${PREFIX}/apps/
 
 .include <bsd.port.mk>
Index: head/net/exaddos/Makefile
===================================================================
--- head/net/exaddos/Makefile	(revision 455912)
+++ head/net/exaddos/Makefile	(revision 455913)
@@ -1,41 +1,41 @@
 # Created by: Ryan Steinmetz <zi@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	exaddos
 PORTVERSION=	0.4.0
 CATEGORIES=	net
 MASTER_SITES=	ZI
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Monitor your network for DDoS
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4-mibs>=0.1.4:net-mgmt/py-snmp4-mibs \
-		${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}snmp4-mibs>=0.1.4:net-mgmt/py-snmp4-mibs@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}snmp4>=4.2.3:net-mgmt/py-snmp4@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Exa-Networks
-USES=		python
+USES=		python:2.7
 SUB_FILES=	pkg-message exaddos.sh exaddos.conf.sample
 SUB_LIST=	PYTHON_LIBDIR=${PYTHON_LIBDIR} PYTHON_CMD=${PYTHON_CMD} \
 		PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
 USE_RC_SUBR=	${PORTNAME}
 NO_ARCH=	yes
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}/lib
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME} ${STAGEDIR}${ETCDIR}
 	@(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PYTHON_SITELIBDIR})
 	@(cd ${WRKSRC}/data/${PORTNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME})
 	${INSTALL_DATA} ${WRKDIR}/exaddos.conf.sample \
 		${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
Index: head/net/gtknetcat/Makefile
===================================================================
--- head/net/gtknetcat/Makefile	(revision 455912)
+++ head/net/gtknetcat/Makefile	(revision 455913)
@@ -1,53 +1,53 @@
 # Created by: Rusmir Dusko <nemysis@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gtknetcat
 PORTVERSION=	0.1
 PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SF/lxde/GtkNetCat%20%28GUI%20for%20netcat%29/GtkNetCat%20${PORTVERSION}/ \
 		SF/nemysisfreebsdp/${CATEGORIES}/:icons
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK GUI for netcat
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	p5-XML-Parser>=0:textproc/p5-XML-Parser
 
-USES=		gmake localbase python shebangfix
+USES=		gmake localbase python:2.7 shebangfix
 SHEBANG_FILES=	src/gtknetcat.in src/gtknetcat.py
 USE_GNOME=	intlhack pygtk2
 GNU_CONFIGURE=	yes
 NO_ARCH=	yes
 
 PORTDOCS=	AUTHORS README
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=	gettext
 NLS_USES_OFF=	gettext-tools
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Icon=|Icon=${PORTNAME}|' \
 		${WRKSRC}/${PORTNAME}.desktop
 
 post-patch-NLS-off:
 	@${REINPLACE_CMD} -e 's|src po|src|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net/mpich2/Makefile
===================================================================
--- head/net/mpich2/Makefile	(revision 455912)
+++ head/net/mpich2/Makefile	(revision 455913)
@@ -1,191 +1,191 @@
 # Created by: dbader@ece.unm.edu
 # $FreeBSD$
 
 PORTNAME=	mpich2
 DISTVERSION=	1.5
 PORTREVISION=	8
 PORTEPOCH=	5
 CATEGORIES=	net java parallel
 MASTER_SITES=	http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${DISTVERSION}/
 DIST_SUBDIR=	mpich
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Portable implementation of MPI-1 and MPI-2
 
 LICENSE=	MPICH
 LICENSE_NAME=	MPICH
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
 
 GNU_CONFIGURE=	yes
 USES=		libtool:keepla localbase fortran perl5 \
-		pkgconfig python
+		pkgconfig python:2.7
 USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	build
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE_i386=	JAVA
 OPTIONS_DEFINE_amd64=	JAVA
 OPTIONS_DEFINE=	SMPD X11 DOCS
 OPTIONS_DEFAULT_i386=	JAVA
 OPTIONS_DEFAULT_amd64=	JAVA
 OPTIONS_DEFAULT=	X11
 JAVA_DESC=	build MPE Jumpshot-4
 SMPD_DESC=	use SMPD instead of MPD, for a mixed-OS cluster
 X11_DESC=	build MPE graphics routines
 
 CONFIGURE_ARGS=	--enable-romio --enable-shared	\
 		--docdir="${DOCSDIR}" \
 		--with-python="${PYTHON_CMD}"
 CONFIGURE_ENV=	FCFLAGS="${FFLAGS}" \
 		MPI_CFLAGS="-I${LOCALBASE}/include" \
 		PACKAGE="${PORTNAME}" \
 		PTHREAD_LIBS="-lpthread"
 
 .if ${FFLAGS} == "-O"
 FFLAGS=		-O2
 .endif
 LDFLAGS+=	-lpthread -lexecinfo
 
 MAKE_ENV=	CCACHE_DISABLE=yes PACKAGE=${PORTNAME}
 NOCCACHE=	yes
 
 CONFLICTS=	lam-7.* mpd-[0-9]* mpiexec-0.*
 
 VERSO=		8.0.1
 VERSOM=		${VERSO:R:R}
 PLIST_SUB=	VER=${VERSO} VERM=${VERSOM}
 SUB_FILES=	pkg-message
 
 THREAD2FIX=	configure test/mpi/threads/comm/Makefile.in	\
 		test/mpi/threads/pt2pt/Makefile.in		\
 		src/mpe2/src/logging/configure			\
 		src/mpi/romio/configure src/openpa/configure	\
 		src/pm/hydra/configure
 LOCALBASE2FIX=	src/mpe2/src/slog2sdk/trace_rlog/configure	\
 		src/mpe2/src/slog2sdk/trace_sample/configure	\
 		src/mpe2/src/graphics/configure
 STAGE2FIX=	bin/mpicc bin/mpicxx bin/mpif77 bin/mpif90	\
 		etc/mpicc.conf etc/mpicxx.conf etc/mpif77.conf	\
 		etc/mpif90.conf sbin/mpeuninstall
 DOC2PATCH=	Makefile.in src/mpe2/sbin/mpeinstall.in		\
 		src/openpa/Makefile.in src/mpi/romio/util/romioinstall.in
 CONFPFX2FIX1=	src/pm/mpd/mpd.py
 CONFPFX2FIX2=	doc/installguide/install.tex.vin		\
 		src/pm/mpd/mpdroot.c
 BIN2STRIP=	check_callstack clog2_join clog2_print clog2_repair
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 MAKE_ENV+=	VERBOSE=1
 .endif
 
 .if ! ${PORT_OPTIONS:MJAVA}
 CONFIGURE_ARGS+=	--without-java
 PLIST_SUB+=	JAVA="@comment "
 PLX11=		"@comment "
 .else
 .if ! ${PORT_OPTIONS:MX11}
 IGNORE=		WITH_JAVA requires WITH_X11
 .endif
 CONFIGURE_ARGS+=	--with-java="${JAVA_HOME}"
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 PLIST_SUB+=	JAVA=""
 PLX11=		""
 BIN2STRIP+=	rlog_check_timeorder rlog_print
 .endif
 
 #define WITH_RECV_TIMEOUT to be an appropriate value (>20 for slow machines),
 #in order to set a different default MPIEXEC_RECV_TIMEOUT
 .if defined(MAINTAINER_MODE)
 WITH_RECV_TIMEOUT?=	100
 .else
 WITH_RECV_TIMEOUT?=	20
 .endif
 
 .if ${PORT_OPTIONS:MSMPD}
 CONFIGURE_ARGS+=	--with-pmi=smpd --with-pm=smpd
 PLIST_SUB+=	PM_MPD="@comment " PM_SMPD=""
 .else
 CONFIGURE_ARGS+=	--with-pmi=simple --with-pm=mpd
 PLIST_SUB+=	PM_MPD="" PM_SMPD="@comment "
 BIN2STRIP+=	mpdroot
 .endif
 
 .if ! ${PORT_OPTIONS:MX11}
 CONFIGURE_ARGS+=	--disable-graphics
 PLIST_SUB+=	X11="@comment "
 .else
 CONFIGURE_ARGS+=	--x-includes=${LOCALBASE}/include --x-libraries==${LOCALBASE}/lib
 USE_XORG=	x11 xt
 PLIST_SUB+=	X11=${PLX11}
 .endif
 
 .include <bsd.port.pre.mk>
 
 pre-configure:
 	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${LOCALBASE2FIX:S|^|${WRKSRC}/|}
 	${FIND} ${WRKSRC} -name configure | ${XARGS}	\
 		${REINPLACE_CMD} -e 's|doc/$${PACKAGE}|doc/${PORTNAME}|'
 .for fin in ${DOC2PATCH}
 . if ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|%%PORTDOCS%%||' ${WRKSRC}/${fin}
 . else
 	${REINPLACE_CMD} -e 's|%%PORTDOCS%%|#|' ${WRKSRC}/${fin}
 . endif
 .endfor
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's|lib doc share|lib share|'	\
 		${WRKSRC}/src/mpe2/src/slog2sdk/sbin/install-package.in
 .endif
 	${REINPLACE_CMD} -e '/MPIEXEC_RECV_TIMEOUT/s|20,|${WITH_RECV_TIMEOUT},|' \
 		${WRKSRC}/src/pm/mpd/mpiexec.py
 	${REINPLACE_CMD} -e 's|%%SRCDIR%%|${WRKSRC}|' ${WRKSRC}/${CONFIGURE_SCRIPT}
 .for cnf in ${CONFPFX2FIX1}
 	${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/${cnf}
 .endfor
 .for cnf in ${CONFPFX2FIX2}
 	${REINPLACE_CMD} -e 's|/etc/mpd.conf|${PREFIX}/etc/mpd.conf|'	\
 		${WRKSRC}/${cnf}
 .endfor
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f bin)
 	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py	\
 		-d ${PREFIX} -f bin)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${WRKDIR}/mpd.conf.dist
 	${INSTALL_DATA} ${WRKDIR}/mpd.conf.dist ${STAGEDIR}${PREFIX}/etc/
 .for pg in ${STAGE2FIX}
 	${REINPLACE_CMD} -e '/${STAGEDIR:C|/|\/|g}/s|${STAGEDIR}||'	\
 		${STAGEDIR}${PREFIX}/${pg}
 	${RM} ${STAGEDIR}${PREFIX}/${pg}.bak
 .endfor
 .for pg in ${BIN2STRIP}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${pg}
 .endfor
 .if ${PORT_OPTIONS:MJAVA}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/trace_rlog/libTraceInput.so
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 .if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf
 	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 .endif
 	@${ECHO_MSG} "Increase MPIEXEC_RECV_TIMEOUT if needed!"
 	${PREFIX}/bin/mpd &
 	(cd ${WRKSRC} && \
 	PATH=${PATH}:${PREFIX}/bin VERBOSE=1 ${MAKE} testing)
 	${PREFIX}/bin/mpdallexit
 .endif
 
 .include <bsd.port.post.mk>
Index: head/net-im/libpurple/Makefile
===================================================================
--- head/net-im/libpurple/Makefile	(revision 455912)
+++ head/net-im/libpurple/Makefile	(revision 455913)
@@ -1,317 +1,317 @@
 # Created by: Jim Mock <jim@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME?=	libpurple
 PORTVERSION=	2.12.0
 PORTREVISION=	2
 CATEGORIES?=	net-im
 MASTER_SITES=	SF/pidgin/Pidgin/${PORTVERSION}
 DISTNAME=	pidgin-${PORTVERSION}
 
 MAINTAINER?=	marcus@FreeBSD.org
 COMMENT?=	Backend library for the Pidgin multi-protocol messaging client
 
 USES+=		cpe gettext gmake libtool pathfix pkgconfig tar:bzip2
 USE_GNOME?=	gnomeprefix intltool glib20 libxml2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-gtkui \
 		--disable-consoleui \
 		--with-dynamic-prpls=${PRPL_MODULES:S/,$//} \
 		--enable-static \
 		--disable-nm
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 .if !defined(PIDGIN_SLAVE)
 # Pidgin slave ports that require the following functionality, must explicitly
 # set these macros themselves.
 USES+=		iconv python:2.7 shebangfix
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	libpurple/purple-remote \
 		libpurple/purple-url-handler
 
 .if defined(PACKAGE_BUILDING)
 WITH_GNOME=	yes
 .endif
 
 .endif
 
 PRPL_MODULES=
 
 CPE_VENDOR=	pidgin
 
 OPTIONS_DEFINE=	BONJOUR DBUS GNUTLS NSS SASL GSTREAMER VV IDN PERL TCLTK
 OPTIONS_GROUP=		PROTOCOLS
 OPTIONS_GROUP_PROTOCOLS=GG SAMETIME SILC IRC JABBER \
 			NOVELL OSCAR QQ SIMPLE ZEPHYR
 OPTIONS_DEFAULT=	BONJOUR DBUS NSS GSTREAMER VV IDN GG IRC JABBER \
 			NOVELL OSCAR QQ SIMPLE ZEPHYR
 BONJOUR_DESC=	mDNS support
 GNUTLS_DESC=	Use GNUTLS for encryption support
 NSS_DESC=	Use Mozilla NSS for encryption support
 SASL_DESC=	Cyrus SASL support (for jabberd)
 GSTREAMER_DESC=	Use GStreamer for playing sounds
 VV_DESC=	Video and voice support
 SAMETIME_DESC=	The Lotus Sametime chat protocol
 SILC_DESC=	The Secure Internet Live Conferencing protocol
 GG_DESC=	The Gadu-Gadu chat protocol
 IRC_DESC=	The Internet Relay Chat protocol
 JABBER_DESC=	The Jabber/XMPP/Google Talk protocol
 NOVELL_DESC=	The Novell GroupWise chat protocol
 OSCAR_DESC=	The AIM/ICQ/Oscar protocol
 QQ_DESC=	The Tercent QQ chat protocol
 SIMPLE_DESC=	The SIMPLE chat protocol
 ZEPHYR_DESC=	The Zephyr chat protocol
 
 .if defined(WITH_GTKUI)
 OPTIONS_DEFINE+=	GTKSPELL CAP
 OPTIONS_DEFAULT+=	GTKSPELL CAP
 GTKSPELL_DESC=	Spell checking support
 CAP_DESC=	Contact Availability Prediction plugin
 PLIST_SUB+=	GTKUI=""
 .else
 PLIST_SUB+=	GTKUI="@comment not installed: "
 .endif
 
 .if defined(WITH_CONSOLEUI)
 OPTIONS_DEFINE+=NCURSES
 NCURSES_DESC=	Build with ncurses from ports
 PLIST_SUB+=	CONSOLEUI=""
 .else
 PLIST_SUB+=	CONSOLEUI="@comment not installed: "
 .endif
 
 CONFIGURE_ARGS+=--disable-doxygen
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTCLTK}
 USES+=			tk
 CFLAGS+=		-I${TK_INCLUDEDIR} -I${TCL_INCLUDEDIR}
 CONFIGURE_ARGS+=	--with-tclconfig=${TCL_LIBDIR} \
 			--with-tkconfig=${TK_LIBDIR}
 PLIST_SUB+=		TCL:=""
 .else
 CONFIGURE_ARGS+=	--disable-tcl
 PLIST_SUB+=		TCL:="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MNCURSES}
 USES+=		ncurses:port
 CONFIGURE_ARGS+=--with-ncurses-headers=${LOCALBASE}/include/ncurses/
 .else
 USES+=		ncurses
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
 USES+=			perl5
 CONFIGURE_ARGS+=	--with-perl-lib=site
 PLIST_SUB+=		PERL:=""
 .if !defined(PIDGIN_SLAVE) || defined(WITH_GTKUI)
 PLIST_SUB+=		PERLMAN:=""
 .else
 PLIST_SUB+=		PERLMAN:="@comment not installed: "
 .endif
 .else
 CONFIGURE_ARGS+=	--disable-perl
 PLIST_SUB+=		PERL:="@comment not installed: " \
 			PERLMAN:="@comment not installed: "
 .endif
 
 .if defined(WITH_GTKUI) && !defined(PIDGIN_SLAVE)
 USE_GNOME+=	gconf2
 GCONF_SCHEMAS=	purple.schemas
 .endif
 
 #.if defined(WITH_GTKUI)
 #USE_GNOME+=		evolutiondataserver
 #PLIST_SUB+=		EVO=""
 #CONFIGURE_ARGS+=	--enable-gevolution
 #.else
 CONFIGURE_ARGS+=	--disable-gevolution
 PLIST_SUB+=		EVO="@comment not installed: "
 #.endif
 
 .if ${PORT_OPTIONS:MGSTREAMER}
 USE_GSTREAMER1+=core good
 .else
 CONFIGURE_ARGS+=--disable-gstreamer
 .endif
 
 .if ${PORT_OPTIONS:MVV} && ${PORT_OPTIONS:MGSTREAMER}
 LIB_DEPENDS+=	libfarstream-0.2.so:net-im/farstream
 USE_GSTREAMER1+=v4l2
 PLIST_SUB+=	VV=""
 .else
 CONFIGURE_ARGS+=--disable-vv
 PLIST_SUB+=	VV="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIDN}
 LIB_DEPENDS+=	libidn.so:dns/libidn
 .else
 CONFIGURE_ARGS+=--disable-idn
 .endif
 
 .if ${PORT_OPTIONS:MCAP}
 LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
 CONFIGURE_ARGS+=--enable-cap
 PLIST_SUB+=	CAP=""
 .else
 CONFIGURE_ARGS+=--disable-cap
 PLIST_SUB+=	CAP="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=		libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=	--enable-gnutls=yes
 PLIST_SUB+=		GNUTLS=""
 .else
 CONFIGURE_ARGS+=	--enable-gnutls=no
 PLIST_SUB+=		GNUTLS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNSS}
 LIB_DEPENDS+=		libnss3.so:security/nss
 CONFIGURE_ARGS+=	--enable-nss=yes \
 			--with-nspr-includes=${LOCALBASE}/include/nspr \
 			--with-nspr-libs=${LOCALBASE}/lib \
 			--with-nss-includes=${LOCALBASE}/include/nss/nss \
 			--with-nss-libs=${LOCALBASE}/lib/nss
 PLIST_SUB+=		NSS=""
 .else
 CONFIGURE_ARGS+=	--enable-nss=no
 PLIST_SUB+=		NSS="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
 LIB_DEPENDS+=		libsasl2.so:security/cyrus-sasl2
 CONFIGURE_ARGS+=	--enable-cyrus-sasl
 .endif
 
 .if ${PORT_OPTIONS:MBONJOUR}
 LIB_DEPENDS+=	libavahi-client.so:net/avahi-app
 PLIST_SUB+=	BONJOUR=""
 PRPL_MODULES:=	bonjour,${PRPL_MODULES}
 .else
 CONFIGURE_ARGS+=--disable-avahi
 PLIST_SUB+=	BONJOUR="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGTKSPELL}
 LIB_DEPENDS+=		libgtkspell.so:textproc/gtkspell
 .else
 CONFIGURE_ARGS+=	--disable-gtkspell
 .endif
 
 .if ${PORT_OPTIONS:MDBUS}
 LIB_DEPENDS+=		libdbus-glib-1.so:devel/dbus-glib
 .if !defined(PIDGIN_SLAVE)
-RUN_DEPENDS+=		${PYTHON_SITELIBDIR}/dbus/__init__.py:devel/py-dbus
+RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 .endif
 CONFIGURE_ARGS+=	--enable-dbus
 PLIST_SUB+=		DBUS=""
 .else
 CONFIGURE_ARGS+=	--disable-dbus
 PLIST_SUB+=		DBUS="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MSAMETIME}
 LIB_DEPENDS+=	libmeanwhile.so:net-im/meanwhile
 PLIST_SUB+=	SAMETIME=""
 PRPL_MODULES:=	sametime,${PRPL_MODULES}
 .else
 PLIST_SUB+=	SAMETIME="@comment not installed: "
 CONFIGURE_ARGS+=--disable-meanwhile
 .endif
 
 .if ${PORT_OPTIONS:MSILC}
 LIB_DEPENDS+=		libsilcclient.so:devel/silc-toolkit
 CONFIGURE_ARGS+=	--with-silc-includes=${LOCALBASE}/include/silc \
 			--with-silc-libs=${LOCALBASE}/lib
 PLIST_SUB+=		SILC=""
 PRPL_MODULES:=		silc,${PRPL_MODULES}
 .else
 PLIST_SUB+=		SILC="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MGG}
 PLIST_SUB+=		GG=""
 PRPL_MODULES:=		gg,${PRPL_MODULES}
 .else
 PLIST_SUB+=		GG="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MIRC}
 PLIST_SUB+=		IRC=""
 PRPL_MODULES:=		irc,${PRPL_MODULES}
 .else
 PLIST_SUB+=		IRC="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MJABBER}
 PLIST_SUB+=		JABBER=""
 PRPL_MODULES:=		jabber,${PRPL_MODULES}
 .else
 PLIST_SUB+=		JABBER="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MNOVELL}
 PLIST_SUB+=		NOVELL=""
 PRPL_MODULES:=		novell,${PRPL_MODULES}
 .else
 PLIST_SUB+=		NOVELL="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MOSCAR}
 PLIST_SUB+=		OSCAR=""
 PRPL_MODULES:=		oscar,${PRPL_MODULES}
 .else
 PLIST_SUB+=		OSCAR="@comment not installed: "
 .endif
 
 #.if ${PORT_OPTIONS:MQQ}
 #PLIST_SUB+=		QQ=""
 #PRPL_MODULES:=		qq,${PRPL_MODULES}
 #.else
 #PLIST_SUB+=		QQ="@comment not installed: "
 #.endif
 
 .if ${PORT_OPTIONS:MSIMPLE}
 PLIST_SUB+=		SIMPLE=""
 PRPL_MODULES:=		simple,${PRPL_MODULES}
 .else
 PLIST_SUB+=		SIMPLE="@comment not installed: "
 .endif
 
 .if ${PORT_OPTIONS:MZEPHYR}
 PLIST_SUB+=		ZEPHYR=""
 PRPL_MODULES:=		zephyr,${PRPL_MODULES}
 .else
 PLIST_SUB+=		ZEPHYR="@comment not installed: "
 .endif
 
 pre-everything::
 .if ! ${PORT_OPTIONS:MGNUTLS} && ! ${PORT_OPTIONS:MNSS}
 	@${ECHO_MSG} "WARNING: In order to use MSN, you must enable the GNUTLS and/or NSS options."
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|-lpthread $$LIBDL|-lpthread ${ICONV_LIB}|' \
 		${WRKSRC}/configure
 .if defined(PIDGIN_SLAVE)
 	@${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|'
 	@${REINPLACE_CMD} -e 's|gconftool-2|gconftool-disabled|g' \
 		${WRKSRC}/configure
 .endif
 
 .if !defined(PIDGIN_SLAVE) && ${PORT_OPTIONS:MPERL}
 post-install:
 	@${SED} -i '' -e 's|^${STAGEDIR}||g' \
 		${STAGEDIR}${PREFIX}/lib/purple-2/perl/auto/Purple/.packlist
 .endif
 
 .include <bsd.port.mk>
Index: head/net-im/telepathy-mission-control/Makefile
===================================================================
--- head/net-im/telepathy-mission-control/Makefile	(revision 455912)
+++ head/net-im/telepathy-mission-control/Makefile	(revision 455913)
@@ -1,33 +1,33 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 #    $MCom: ports/trunk/net-im/telepathy-mission-control/Makefile 19955 2014-10-15 10:15:00Z gusi $
 
 PORTNAME=	telepathy-mission-control
 PORTVERSION=	5.16.3
 PORTREVISION=	1
 CATEGORIES=	net-im devel
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-mission-control/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Telepathy component to apps to abstract details of connection managers
 
 LIB_DEPENDS=	libtelepathy.so:net-im/libtelepathy \
 		libdbus-glib-1.so:devel/dbus-glib
 
-USES=		gmake libtool pathfix pkgconfig
+USES=		gmake libtool pathfix pkgconfig python:2.7,build
 USE_GNOME=	glib20 libxslt
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--disable-upower
 USE_LDCONFIG=	yes
 GLIB_SCHEMAS=	im.telepathy.MissionControl.FromEmpathy.gschema.xml
 INSTALL_TARGET=	install-strip
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${datadir}/gtk-doc/html|${DOCSDIR}|' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: head/net-im/telepathy-qt4/Makefile
===================================================================
--- head/net-im/telepathy-qt4/Makefile	(revision 455912)
+++ head/net-im/telepathy-qt4/Makefile	(revision 455913)
@@ -1,68 +1,68 @@
 # Created by: Alberto Villa <avilla@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	telepathy-qt
 PORTVERSION=	0.9.7
 PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://telepathy.freedesktop.org/releases/${PORTNAME}/
 PKGNAMESUFFIX?=	4
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	High-level Qt binding for Telepathy
 
 LICENSE=	LGPL21
 
-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus@${PY_FLAVOR}
 LIB_DEPENDS=	libtelepathy-farstream.so:net-im/telepathy-farstream \
 		libtelepathy-glib.so:net-im/telepathy-glib
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_dbus_bindings.so:devel/py-dbus@${PY_FLAVOR}
 
 OPTIONS_DEFINE=	DOCS
 
 USE_GNOME=	glib20 libxslt:build
 USE_GSTREAMER=	yes
 USES=		cmake:outsource gettext pathfix pkgconfig python:2,build
 CMAKE_ARGS=	-DENABLE_EXAMPLES:BOOL=False \
 		-DENABLE_FARSIGHT:BOOL=False \
 		-DENABLE_FARSTREAM:BOOL=True \
 		-DENABLE_TESTS:BOOL=False \
 		-DDESIRED_QT_VERSION:STRING=${PKGNAMESUFFIX} \
 		-DQT_QMAKE_EXECUTABLE:FILEPATH=${QMAKE}
 . if ${PKGNAMESUFFIX:M4}
 USE_QT4=	corelib dbus gui network qtestlib_build xml \
 		moc_build qmake_build rcc_build uic_build
 SHLIB_SUFFIX=	2
 . else
 USE_QT5=	core dbus gui network xml \
 		buildtools_build qmake_build testlib_build widgets_build
 SHLIB_SUFFIX=	0
 . endif
 
 USE_LDCONFIG=	yes
 
 # Required because FindGObject.cmake is too old and uses the pkg-config values
 # directly (-lgobject-2.0 instead of /path/to/libgobject-2.0.so).
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 # We do not need Doxygen because the tarball already ships with prebuilt
 # documentation.
 CMAKE_ARGS+=	-DDOXYGEN_EXECUTABLE:FILEPATH=""
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}" \
 		QTVER_SUFFIX="${PKGNAMESUFFIX}" \
 		SHLIB_SUFFIX="${SHLIB_SUFFIX}"
 
 PORTDOCS=	AUTHORS ChangeLog HACKING NEWS README html
 # Manually set DOCSDIR, to handle the version suffix
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${CP} -R doc/html .
 . for f in ${PORTDOCS}
 	cd ${WRKSRC} && ${COPYTREE_SHARE} ${f} ${STAGEDIR}${DOCSDIR}
 . endfor
 
 .include <bsd.port.mk>
Index: head/science/gnudatalanguage/Makefile
===================================================================
--- head/science/gnudatalanguage/Makefile	(revision 455912)
+++ head/science/gnudatalanguage/Makefile	(revision 455913)
@@ -1,143 +1,143 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	gnudatalanguage
 DISTVERSION=	0.9.7
 PORTREVISION=	9
 CATEGORIES=	science lang
 MASTER_SITES=	SF/${PORTNAME}/gdl/${PORTVERSION}
 .if defined(BUILD_PYTHON_MODULE)
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 .endif
 DISTNAME=	gdl-${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT?=	GDL, a free IDL compatible incremental compiler
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS+=	libplplot.so:math/plplot	\
 		libpng.so:graphics/png		\
 		libsz.so:science/szip		\
 		libps.so:print/pslib		\
 		libgsl.so:math/gsl
 
 USE_WX=		3.0+
 USE_XORG=	x11 sm ice xext
 USES=		cmake:outsource compiler:gcc-c++11-lib dos2unix ncurses pkgconfig readline tar:tgz
 
 # On FreeBSD < 11 libc++ lacks support for sized delete operators.
 # GCC dropped the builtin version of these operators in 6+ by
 # defaulting to gnu++14. Force c++11 instead.
 # For a more detailed discussion see:
 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484
 USE_CXXSTD=	gnu++11
 
 # Disable ncurses and readline from ports
 # Disable ImageMagick (does'nt work with plplot because dynamic drivers
 #	are enabled by default)
 # TODO: add a slave port for mpich
 # TODO: create a port for Cmsvlib http://cow.physics.wisc.edu/~craigm/idl/down/cmsvlib.tar.gz
 # TODO:	create a port for Astron http://idlastro.gsfc.nasa.gov/ftp/astron.tar.gz
 # TODO:	create a port for TexToIdl http://physics.mnstate.edu/mcraig/textoidl/textoidl-2-1-2.tar
 
 CMAKE_ARGS=	-DREADLINEDIR:STRING="/usr"		\
 		-DNCURSESDIR:STRING="/usr"		\
 		-DMPICH:BOOL=NO				\
 		-DMAGICK:BOOL=NO
 CPPFLAGS+=	${CFLAGS} -fno-inline -DNPY_NO_DEPRECATED_API -DNPY_1_7_API_VERSION
 LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
 
 SLAVEDIRS=	science/py-gnudatalanguage
 
 OPTIONS_DEFINE=	EIGEN EXAMPLES FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 MPICH2 NETCDF PYTHON QHULL UDUNITS
 OPTIONS_DEFAULT=EIGEN FFTW GRAPHICSMAGICK GRIB HDF5 LIBPROJ4 NETCDF PYTHON UDUNITS
 
 EIGEN_DESC=	Eigen3 support (boost performance)
 EIGEN_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen3.pc:math/eigen3
 EIGEN_CMAKE_ON=		-DEIGEN3:BOOL=YES
 EIGEN_CMAKE_OFF=	-DEIGEN3:BOOL=NO
 
 FFTW_LIB_DEPENDS=	libfftw3.so:math/fftw3		\
 			libfftw3f.so:math/fftw3-float
 FFTW_CMAKE_ON=		-DFFTW:BOOL=YES
 FFTW_CMAKE_OFF=		-DFFTW:BOOL=NO
 
 GRAPHICSMAGICK_DESC=		Support GraphicsMagick
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CMAKE_ON=	-DGRAPHICSMAGICK:BOOL=YES
 GRAPHICSMAGICK_CMAKE_OFF=	-DGRAPHICSMAGICK:BOOL=NO
 
 GRIB_DESC=		Support GRIB messages
 GRIB_LIB_DEPENDS=	libgrib_api.so:science/grib_api
 GRIB_CMAKE_ON=		-DGRIB:BOOL=YES
 GRIB_CMAKE_OFF=		-DGRIB:BOOL=NO
 
 HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 HDF5_CMAKE_ON=		-DHDF5:BOOL=YES
 HDF5_CMAKE_OFF=		-DHDF5:BOOL=NO -DHDF:BOOL=NO
 
 LIBPROJ4_DESC=		Support cartographic processes
 LIBPROJ4_LIB_DEPENDS=	libproj.so:graphics/proj
 LIBPROJ4_CMAKE_ON=	-DLIBPROJ4:BOOL=YES
 LIBPROJ4_CMAKE_OFF=	-DLIBPROJ4:BOOL=NO
 
 MPICH2_LIB_DEPENDS=	libmpich.so.8:net/mpich2
 MPICH2_CMAKE_ON=	-DMPICH:BOOL=YES
 MPICH2_CMAKE_OFF=	-DMPICH:BOOL=NO
 
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_CMAKE_ON=	-DNETCDF:BOOL=YES -DHDF:BOOL=NO
 NETCDF_CMAKE_OFF=	-DNETCDF:BOOL=NO
 
 PYTHON_USES=		python:2.7
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY} \
-			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib
+			${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 PYTHON_CMAKE_ON=	-DPYTHON:BOOL=YES -DPYTHONVERSION:STRING="${PYTHON_VER}"
 PYTHON_CMAKE_OFF=	-DPYTHON:BOOL=NO
 
 QHULL_DESC=		Enable Qhull support
 QHULL_LIB_DEPENDS=	libqhull.so:math/qhull
 QHULL_CMAKE_ON=		-DQHULL:BOOL=YES
 QHULL_CMAKE_OFF=	-DQHULL:BOOL=NO
 
 UDUNITS_LIB_DEPENDS=	libudunits2.so:science/udunits
 UDUNITS_CMAKE_ON=	-DUDUNITS:BOOL=YES
 UDUNITS_CMAKE_OFF=	-DUDUNITS:BOOL=NO
 
 .if defined(BUILD_PYTHON_MODULE)
 CATEGORIES+=	python
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=YES -DOPENMP:BOOL=NO
 PLIST=		${.CURDIR}/pkg-plist.pymod
 .else
 CMAKE_ARGS+=	-DPYTHON_MODULE:BOOL=NO
 .endif
 
 .if defined(BUILD_PYTHON_MODULE)
 do-install:
 	${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/src/libgdl.so ${STAGEDIR}${PYTHON_SITELIBDIR}/GDL.so
 .endif
 
 .if !defined(BUILD_PYTHON_MODULE)
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/testsuite
 	(cd ${WRKSRC}/testsuite && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/testsuite/)
 .endif
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install
 . if defined(BUILD_PYTHON_MODULE)
 	@${ECHO_CMD} 'import GDL' > ${WRKDIR}/testgdl.py
 	@${ECHO_CMD} 'print GDL.function("sin",(1,))' >> ${WRKDIR}/testgdl.py
 	${PYTHON_CMD} ${WRKDIR}/testgdl.py
 . else
 	@${ECHO_CMD} ".RUN ${EXAMPLESDIR}/testsuite/test_suite.pro"	\
 		> ${WRKDIR}/testgdl
 	@${ECHO_CMD} "exit" >> ${WRKDIR}/testgdl
 	${PREFIX}/bin/gdl < ${WRKDIR}/testgdl
 . endif
 .endif
 
 .include <bsd.port.mk>
Index: head/security/gnome-password-generator/Makefile
===================================================================
--- head/security/gnome-password-generator/Makefile	(revision 455912)
+++ head/security/gnome-password-generator/Makefile	(revision 455913)
@@ -1,25 +1,25 @@
 # Created by: Sergey Akifyev <asa@gascom.ru>
 # $FreeBSD$
 
 PORTNAME=	gnome-password-generator
 PORTVERSION=	1.6
 PORTREVISION=	5
 CATEGORIES=	security gnome python
 MASTER_SITES=	SF/gnome-password/Gnome%20Password%20Generator/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNOME 2 password generator
 
 USE_GNOME=	pygnome2
-USES=		python
+USES=		python:2.7
 
 do-build:
 	@cd ${WRKSRC} && ${SED} -e 's|/usr/bin/python|${PYTHON_CMD}|g ; \
 		 s|/usr/share|${PREFIX}/share|g' ${PORTNAME}.py > ${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/*.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/*.desktop ${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.mk>
Index: head/security/revelation/Makefile
===================================================================
--- head/security/revelation/Makefile	(revision 455912)
+++ head/security/revelation/Makefile	(revision 455913)
@@ -1,41 +1,41 @@
 # Created by: ports@c0decafe.net
 # $FreeBSD$
 
 PORTNAME=	revelation
 PORTVERSION=	0.4.14
 PORTREVISION=	4
 CATEGORIES=	security gnome
 MASTER_SITES=	https://bitbucket.org/erikg/revelation/downloads/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Password manager for the GNOME 2 desktop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus \
-		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR}
 LIB_DEPENDS=	libcrack.so:security/cracklib
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}cracklib>0:security/py-cracklib
 
-USES=		desktop-file-utils gettext gmake pathfix pkgconfig python \
+USES=		desktop-file-utils gettext gmake pathfix pkgconfig python:2.7 \
 		shared-mime-info shebangfix tar:bzip2
 SHEBANG_FILES=	src/revelation.py
 USE_GNOME=	gnomeprefix pygnome2 intltool
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--without-applet --disable-desktop-update --disable-mime-update
 
 GCONF_SCHEMAS=	revelation.schemas
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DICTPATH=	${LOCALBASE}/libdata/cracklib/pw_dict
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/FascistCheck/s|(password)|(password, "${DICTPATH}")|' \
 		${WRKSRC}/src/lib/util.py
 
 .include <bsd.port.mk>
Index: head/sysutils/qzeitgeist/Makefile
===================================================================
--- head/sysutils/qzeitgeist/Makefile	(revision 455912)
+++ head/sysutils/qzeitgeist/Makefile	(revision 455913)
@@ -1,63 +1,63 @@
 # $FreeBSD$
 
 PORTNAME=	qzeitgeist
 PORTVERSION=	0.8.0
 PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	KDE/stable/lib${PORTNAME}/${PORTVERSION}/src/:kde \
 		http://launchpad.net/zeitgeist/${ZEITGEIST_VERSION:R}/${ZEITGEIST_VERSION}/+download/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:kde \
 		zeitgeist-${ZEITGEIST_VERSION}.tar.xz
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	avilla@FreeBSD.org
 COMMENT=	Qt 4 wrapper library around the Zeitgeist D-Bus API
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rapper:textproc/raptor2 \
-		${PYTHON_SITELIBDIR}/rdflib/__init__.py:textproc/py-rdflib
+		${PYTHON_PKGNAMEPREFIX}rdflib>=0:textproc/py-rdflib@${PY_FLAVOR}
 
 USES=		cmake kde:4 python:2.7,build tar:bzip2
 USE_KDE=	automoc4
 USE_QT4=	corelib dbus declarative qtestlib \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
 # To be kept in sync with sysutils/zeitgeist.
 ZEITGEIST_VERSION=	0.9.16
 
 post-extract:
 	@(cd ${WRKDIR} && ${TAR} ${EXTRACT_BEFORE_ARGS} \
 		${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.xz \
 		${EXTRACT_AFTER_ARGS})
 	cd ${WRKDIR}/zeitgeist-${ZEITGEIST_VERSION} && \
 		${CP} -r python/*.py \
 			data/ontology \
 			${WRKSRC}/scripts
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} -e '/\.pc/ s|pkgconfig|../libdata/pkgconfig|' \
 		-e 's|share/${PORTNAME}/cmake|lib/cmake/${PORTNAME}|' \
 		-e "/add_subdirectory(tests)/ d" \
 		${WRKSRC}/CMakeLists.txt \
 		${WRKSRC}/src/CMakeLists.txt \
 		${WRKSRC}/QZeitgeistConfig.cmake.in
 	${REINPLACE_CMD} -e 's|zeitgeist.datamodel|datamodel|' \
 		-e 's|env python|env ${PYTHON_CMD}|g' \
 		${WRKSRC}/scripts/onto2cpp.py
 .if ${PYTHON_VERSION:M*3*}
 	${REINPLACE_CMD} -E -e '/except/ s|,| as |' \
 		-e 's|(print) +>> +(sys\.stderr) *, *(.*)|\1(\3, file=\2)|' \
 		-e 's|(print) +(.*)|\1(\2)|' \
 		-e '/gettext\.install/ s|\((.*),.*\)|(\1)|' \
 		-e 's|execfile\((.*)\)|exec(compile(open(\1, "rb").read(), \1, "exec"))|' \
 		-e '/iter(items|keys|values)\(\)/ s|iter||g' \
 		${WRKSRC}/scripts/*.py
 .endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/u-boot-master/Makefile
===================================================================
--- head/sysutils/u-boot-master/Makefile	(revision 455912)
+++ head/sysutils/u-boot-master/Makefile	(revision 455913)
@@ -1,123 +1,123 @@
 # $FreeBSD$
 #
 # Common infrastructure for u-boot ports
 #
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
 DISTVERSIONPREFIX=	ports-v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	Cross-build das u-boot for ${MODEL}
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS+=	gsed:textproc/gsed \
 		swig3.0:devel/swig30 \
 		dtc>=1.4.1:sysutils/dtc
 BUILD_DEPENDS+=	${COMPILER}:devel/${COMPILER}
 
-USES=		gmake python:build shebangfix
+USES=		gmake python:2.7,build shebangfix
 BINARY_ALIAS=	swig=swig3.0 sed=gsed
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
 GH_PROJECT=	u-boot
 
 SHEBANG_FILES=	lib/libfdt/pylibfdt/setup.py
 SSP_UNSAFE=	yes
 UBOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 INST=		${PREFIX}/${UBOOT_DIR}
 DESCR?=		${.CURDIR}/pkg-descr
 
 MAKE_ARGS+=	V=1 CROSS_COMPILE=${CROSS_COMPILE} DTC=${LOCALBASE}/bin/dtc PYTHON=${PYTHON_CMD} ${ARCHFLAGS}
 
 NO_ARCH=	yes
 
 # Sanity checks
 .if !defined(MODEL)
 IGNORE+=	MODEL is not defined
 .endif
 .if !defined(BOARD_CONFIG)
 IGNORE+=	BOARD_CONFIG is not defined
 .endif
 .if !defined(FAMILY)
 IGNORE+=	FAMILY is not defined
 .endif
 
 # Overrides for OMAP family
 UBOOT_PLIST_OMAP=u-boot.img MLO
 
 # Overrides for ALLWINNER family
 UBOOT_PLIST_ALLWINNER=u-boot.img u-boot-sunxi-with-spl.bin
 
 # Overrides for ALLWINNER64 family
 UBOOT_PLIST_ALLWINNER64=u-boot-sunxi-with-spl.bin
 UBOOT_ARCH_ALLWINNER64=aarch64
 
 # Overrides for Zynq 7000 family
 UBOOT_PLIST_ZYNQ_7000=u-boot.img boot.bin uEnv.txt
 UBOOT_MOVE_ZYNQ_7000=${WRKSRC}/spl/boot.bin ${.CURDIR}/files/uEnv.txt
 
 # Overrides for RPI family
 UBOOT_PLIST_RPI=	u-boot.bin
 
 # Uboot variables
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
 UBOOT_VERSION?=	2017.09.00
 
 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu})
 UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}}
 .endif
 UBOOT_PLIST?=u-boot.img
 
 .if !defined(UBOOT_ARCH) && defined(UBOOT_ARCH_${FAMILY:tu})
 UBOOT_ARCH=${UBOOT_ARCH_${FAMILY:tu}}
 .endif
 UBOOT_ARCH?=	arm
 
 .if ${UBOOT_ARCH} == arm
 CROSS_COMPILE=arm-none-eabi-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 .elif ${UBOOT_ARCH} == aarch64
 CROSS_COMPILE=aarch64-none-elf-
 ARCHFLAGS=ARCH=arm
 .else
 # Best guess for other architectures
 CROSS_COMPILE=${UBOOT_ARCH}-none-elf-
 ARCHFLAGS=ARCH=${UBOOT_ARCH}
 .endif
 COMPILER?=${CROSS_COMPILE}gcc
 
 .if !defined(UBOOT_MOVE) && defined(UBOOT_MOVE_${FAMILY:tu})
 UBOOT_MOVE=${UBOOT_MOVE_${FAMILY:tu}}
 .endif
 
 # Each u-boot family has different files to include, bring them in.
 .for i in ${UBOOT_PLIST}
 PLIST_FILES+=	${UBOOT_DIR}/${i}
 .endfor
 PLIST_FILES+=	${UBOOT_DIR}/README
 
 do-configure:
 	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
 
 # If we need to put anything into WRKSRC, do so now so we can build the PLIST
 # in do-install
 .if defined(UBOOT_MOVE)
 pre-install:
 	${CP} ${UBOOT_MOVE} ${WRKSRC}
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${INST}
 .for i in ${UBOOT_PLIST}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${INST}
 .endfor
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
 
 .include <bsd.port.mk>
Index: head/x11/rox-wallpaper/Makefile
===================================================================
--- head/x11/rox-wallpaper/Makefile	(revision 455912)
+++ head/x11/rox-wallpaper/Makefile	(revision 455913)
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	rox-wallpaper
 PORTVERSION=	2.3
 PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	SF/rox/Wallpaper/${PORTVERSION}
 DISTNAME=	Wallpaper-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Wallpaper management tool for the ROX desktop
 
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib
 
-USES=		python
+USES=		python:2.7
 
 WRKSRC=		${WRKDIR}/Wallpaper
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
 	${CP} -r ${WRKSRC} ${STAGEDIR}${PREFIX}/apps/Wallpaper
 
 .include <bsd.port.mk>
Index: head/x11-fm/nemo/Makefile
===================================================================
--- head/x11-fm/nemo/Makefile	(revision 455912)
+++ head/x11-fm/nemo/Makefile	(revision 455913)
@@ -1,88 +1,88 @@
 # Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	nemo
 PORTVERSION=	2.4.5
 CATEGORIES=	x11-fm gnome
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	File manager for the Cinnamon desktop
 
 BUILD_DEPENDS=	gnome-icon-theme>=0:misc/gnome-icon-theme \
 		gtkdocize:textproc/gtk-doc \
-		py*-polib>=0:devel/py-polib \
+		${PYTHON_PKGNAMEPREFIX}polib>=0:devel/py-polib@${PY_FLAVOR} \
 		gnome-autogen.sh:devel/gnome-common \
 		gsettings-desktop-schemas>=0:devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libexif.so:graphics/libexif \
 		libcinnamon-desktop.so:x11/cinnamon-desktop \
 		libnotify.so:devel/libnotify \
 		libexempi.so:textproc/exempi
 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
 USE_GNOME=	gnomedesktop3 gnomeprefix intlhack introspection:build \
 		libxml2 pygobject3
 USE_GITHUB=	yes
 GH_ACCOUNT=	linuxmint
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lpthread
 INSTALL_TARGET=	install-strip
 CONFIGURE_ARGS=	--enable-static --disable-packagekit
 
 GLIB_SCHEMAS=	org.nemo.gschema.xml
 
 OPTIONS_SUB=			yes
 OPTIONS_DEFINE=			TRACKER
 OPTIONS_DEFAULT=		TRACKER
 TRACKER_CONFIGURE_ENABLE=	tracker
 TRACKER_LIB_DEPENDS=		libtracker-sparql-1.0.so:sysutils/tracker
 TRACKER_DESC=			Integration with tracker
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/files${PREFIX}
 
 	@${MV} ${WRKSRC}/files/usr/share ${WRKSRC}/files${PREFIX}
 
 	@${REINPLACE_CMD} -e 's|0.16|1.0|g' \
 		${WRKSRC}/configure.in
 
 	@${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \
 		${WRKSRC}/files/Makefile.in
 
 	@${REINPLACE_CMD} -e 's|-DGTK_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/configure.in
 
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
 		${WRKSRC}/src/nemo-properties-window.c
 
 	@${REINPLACE_CMD} -e 's|"-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED"|""|g' \
 		${WRKSRC}/configure.in
 
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g ;\
 		s|@INTROSPECTION_TYPELIBDIR@|$$(libdir)/girepository-1.0|g ;\
 		s|@INTROSPECTION_GIRDIR@|$$(datadir)/gir-1.0|g' \
 		${WRKSRC}/libnemo-extension/Makefile.am
 
 	@${REINPLACE_CMD} -e 's|x-gnome-saved-search|x-nemo-saved-search|g' \
 		${WRKSRC}/data/nemo.xml.in \
 		${WRKSRC}/libnemo-private/nemo-file-utilities.h
 
 	@${FIND} ${WRKSRC} -name \* | ${XARGS} ${EGREP} -l "#!.*\/usr\/bin\/python" | \
 		${XARGS} ${REINPLACE_CMD} -I "" -e "s|#!.*python.*|#!${PYTHON_CMD}|g"
 
 	@${REINPLACE_CMD} 's|\"/usr|\"${PREFIX}|g' \
 		${WRKSRC}/data/merge_action_strings
 
 	@${REINPLACE_CMD} 's|"files", "usr"|"files", "${PREFIX}".strip("/")|g' \
 		${WRKSRC}/data/merge_action_strings
 
 pre-configure:
 	cd ${WRKSRC} && ${SETENV} NOCONFIGURE=yes ${SH} ./autogen.sh
 
 .include <bsd.port.mk>
Index: head/x11-fm/rox-mime-editor/Makefile
===================================================================
--- head/x11-fm/rox-mime-editor/Makefile	(revision 455912)
+++ head/x11-fm/rox-mime-editor/Makefile	(revision 455913)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	rox-mime-editor
 PORTVERSION=	0.6
 PORTREVISION=	2
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/rox/MIME-Editor/${PORTVERSION}
 DISTNAME=	mime-editor-${PORTVERSION}
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	MIME type editor for the ROX desktop
 
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
-		${LOCALBASE}/lib/ROX-Lib2/python/rox/__init__.py:devel/py-roxlib
+		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib
 
-USES=		python shebangfix tar:bzip2 
+USES=		python:2.7 shebangfix tar:bzip2 
 SHEBANG_FILES=	MIME-Editor/AppRun
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 
 pre-install:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \
 				${WRKSRC}/MIME-Editor/findrox.py
 	@${FIND} ${WRKSRC} -name *.bak -delete
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/apps
 	@${CP} -r ${WRKSRC}/MIME-Editor ${STAGEDIR}${PREFIX}/apps/
 
 .include <bsd.port.mk>
Index: head/x11-fm/rox-session/Makefile
===================================================================
--- head/x11-fm/rox-session/Makefile	(revision 455912)
+++ head/x11-fm/rox-session/Makefile	(revision 455913)
@@ -1,63 +1,63 @@
 # $FreeBSD$
 
 PORTNAME=	rox-session
 PORTVERSION=	0.40.0
 PORTREVISION=	3
 CATEGORIES=	x11-fm
 MASTER_SITES=	SF/rox/ROX-Session/${PORTVERSION}/
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Simple session manager for the ROX desktop
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libdbus-glib-1.so:devel/dbus-glib
 RUN_DEPENDS=	${LOCALBASE}/bin/rox:x11-fm/rox-filer \
 		${PYTHON_PKGNAMEPREFIX}roxlib>=0:devel/py-roxlib \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 
 WRKSRC=		${WRKDIR}/ROX-Session
 DATADIR=	${PREFIX}/apps/ROX-Session
 
-USES=		gettext-tools pkgconfig python
+USES=		gettext-tools pkgconfig python:2.7
 USE_GNOME=	gtk20 libxml2
 USE_XORG=	x11 xext xtst xxf86vm
 
 PORTDOCS=	Changes DBUS-API README
 
 OPTIONS_DEFINE=	GDM DOCS
 OPTIONS_SUB=	yes
 GDM_DESC=	Install GDM login manager
 
 SUB_FILES=	${PORTNAME} rox.desktop
 
 GDM_RUN_DEPENDS=${LOCALBASE}/sbin/gdm:x11/gdm
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "*.orig" -delete
 
 do-build:
 	@${PYTHON_CMD} -m compileall ${WRKSRC}
 	@${PYTHON_CMD} -O -m compileall ${WRKSRC}
 	@cd ${WRKSRC} && ./AppRun --compile
 	@${MKDIR} ${WRKSRC}/Messages
 	@cd ${WRKSRC}/src/po && ./dist
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC} && ${CP} -r .DirIcon AppInfo.xml AppRun \
 		Environment Login Messages Options.xml ROX-Session \
 		ROX-Session.xml RunROX SetupPanel Styles browser images \
 		*.py *.pyc *.pyo ${STAGEDIR}${DATADIR}
 
 do-install-GDM-on:
 	${INSTALL_DATA} ${WRKDIR}/rox.desktop ${STAGEDIR}${PREFIX}/share/applications
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/Help/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/hippo-canvas/Makefile
===================================================================
--- head/x11-toolkits/hippo-canvas/Makefile	(revision 455912)
+++ head/x11-toolkits/hippo-canvas/Makefile	(revision 455913)
@@ -1,26 +1,26 @@
 # Created by: Ashish Shukla <wahjava@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	hippo-canvas
 PORTVERSION=	0.3.0
 PORTREVISION=	7
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Client stacker popup widget for GTK+ toolkit
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
 LIB_DEPENDS=	libcroco-0.6.so:textproc/libcroco
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/pycairo.pc:graphics/py-cairo
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
 
-USES=		gmake libtool pathfix pkgconfig python tar:bzip2
+USES=		gmake libtool pathfix pkgconfig python:2.7 tar:bzip2
 USE_GNOME=	cairo gtk20 glib20 librsvg2 pygtk2 pango
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gtk-doc --enable-python
 USE_LDCONFIG=	yes
 
 pre-configure:
 	${REINPLACE_CMD} -e 's/^SUBDIRS =.*$$/SUBDIRS = ./g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: head/x11-toolkits/py-gtksourceview/Makefile
===================================================================
--- head/x11-toolkits/py-gtksourceview/Makefile	(revision 455912)
+++ head/x11-toolkits/py-gtksourceview/Makefile	(revision 455913)
@@ -1,21 +1,21 @@
 # $FreeBSD$
 #   $MCom: ports/x11-toolkits/py-gtksourceview/Makefile,v 1.24 2010/04/19 11:30:28 kwm Exp $
 
 PORTNAME=	gtksourceview
 PORTVERSION=	2.10.1
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits gnome python
 MASTER_SITES=	GNOME/sources/pygtksourceview/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pygtksourceview-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for GtkSourceView 2
 
-USES=		gmake libtool:keepla pathfix pkgconfig python tar:bzip2
+USES=		gmake libtool:keepla pathfix pkgconfig python:2.7 tar:bzip2
 USE_GNOME=	gnomeprefix gtksourceview2 pygtk2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-docs
 INSTALL_TARGET=	install-strip
 
 .include <bsd.port.mk>