Index: head/accessibility/caribou/Makefile
===================================================================
--- head/accessibility/caribou/Makefile	(revision 521870)
+++ head/accessibility/caribou/Makefile	(revision 521871)
@@ -1,41 +1,41 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	caribou
 PORTVERSION=	0.4.21
 PORTREVISION=	2
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Gnome On-Screen keyboard
 
 LICENSE=	LGPL20
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter \
 		libgee-0.8.so:devel/libgee \
 		libxklavier.so:x11/libxklavier \
 		libcogl-path.so:graphics/cogl \
 		libjson-glib-1.0.so:devel/json-glib \
 		libatspi.so:accessibility/at-spi2-core \
 		libdbus-1.so:devel/dbus
-RUN_DEPENDS=	py3?-atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR}
 
 USES=		gettext gl gmake gnome libtool localbase pathfix \
 		pkgconfig python:3.3+ shebangfix tar:xz xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk30 intlhack introspection:build libxml2 \
 		libxslt:build pygobject3
 USE_PYTHON=	py3kplist
 SHEBANG_FILES=	tools/fix_gir.py tools/make_schema.py
 USE_GL=		egl
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr xtst
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--enable-gtk2-module=no
 GLIB_SCHEMAS=	org.gnome.caribou.gschema.xml \
 		org.gnome.antler.gschema.xml
 
 .include <bsd.port.mk>
Index: head/accessibility/orca/Makefile
===================================================================
--- head/accessibility/orca/Makefile	(revision 521870)
+++ head/accessibility/orca/Makefile	(revision 521871)
@@ -1,44 +1,44 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	orca
 PORTVERSION=	3.28.2
 PORTREVISION=	2
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Scriptable screen reader
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
-		py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \
-		py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR} \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libatspi.so:accessibility/at-spi2-core
-RUN_DEPENDS=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
-		py3?-speech-dispatcher>=0:accessibility/py-speech-dispatcher@${PY_FLAVOR} \
-		py3?-atspi>=0:accessibility/py-atspi@${PY_FLAVOR} \
-		py3?-xdg>=0:devel/py-xdg@${PY_FLAVOR} \
-		py3?-cairo>=0:graphics/py-cairo@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}speech-dispatcher>=0:accessibility/py-speech-dispatcher@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}atspi>=0:accessibility/py-atspi@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}xdg>=0:devel/py-xdg@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}cairo>=0:graphics/py-cairo@${PY_FLAVOR}
 
 # conflict with py*-json-py because orca uses the json from python itself
 # and py*-json-py shadows this.
 CONFLICTS=	py*-json-py-[0-9]*
 PORTSCOUT=	limitw:1,even
 
 NO_ARCH=	yes
 USES=		gettext gmake gnome localbase pathfix pkgconfig \
 		python:3.4+ tar:xz
 USE_GNOME=	gtk30 pygobject3 intlhack
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
 		${WRKSRC}/src/orca/orca_i18n.py
 
 .include <bsd.port.mk>
Index: head/editors/gedit-plugins/Makefile
===================================================================
--- head/editors/gedit-plugins/Makefile	(revision 521870)
+++ head/editors/gedit-plugins/Makefile	(revision 521871)
@@ -1,52 +1,52 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	gedit-plugins
 PORTVERSION=	3.28.1
 PORTREVISION=	3
 CATEGORIES=	editors gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Plugins for GEdit 3
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	gedit>=0:editors/gedit \
 		valac:lang/vala \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libpeas-1.0.so:devel/libpeas \
 		libzeitgeist-2.0.so:sysutils/zeitgeist \
 		libgit2-glib-1.0.so:devel/libgit2-glib
 RUN_DEPENDS=	gedit>=0:editors/gedit
 
 PORTSCOUT=	limitw:1,even
 
 USES=		compiler:c11 gettext gmake gnome libtool localbase pathfix pkgconfig \
 		python:3.4+ tar:xz
 USE_GNOME=	cairo gdkpixbuf2 gtk30 gtksourceview3 intlhack introspection
 USE_CSTD=	c11
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.gedit.plugins.drawspaces.gschema.xml \
 		org.gnome.gedit.plugins.wordcompletion.gschema.xml
 
 USES+=		python
-BUILD_DEPENDS+=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR}
+BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR}
 LIB_DEPENDS+=	libgucharmap_2_90.so:deskutils/gucharmap
-RUN_DEPENDS+=	py3?-dbus>=0:devel/py-dbus@${PY_FLAVOR} \
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dbus>=0:devel/py-dbus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}libpeas>=0:devel/py-libpeas@${PY_FLAVOR}
 USE_GNOME+=	vte3
 CONFIGURE_ARGS+=--enable-python
 GLIB_SCHEMAS+=	org.gnome.gedit.plugins.terminal.gschema.xml \
 		org.gnome.gedit.plugins.translate.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's| \\t\\r\\n\\f|[:space:]|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>