diff --git a/games/py-pychess/Makefile b/games/py-pychess/Makefile
index b542c1da5b3f..dc3724cf3d12 100644
--- a/games/py-pychess/Makefile
+++ b/games/py-pychess/Makefile
@@ -1,32 +1,32 @@
 # Created by: Nicola Vitale <nivit@FreeBSD.org>
 
 PORTNAME=	pychess
 PORTVERSION=	1.0.2
 CATEGORIES=	games python
 MASTER_SITES=	https://github.com/pychess/pychess/releases/download/${PORTVERSION}/
 
 MAINTAINER=	kevinz5000@gmail.com
 COMMENT=	GTK chess client written in Python
 
 LICENSE=	GPLv3
 
 COMMON_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}sqlalchemy*>1.:databases/py-sqlalchemy13@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}psutil*>0.:sysutils/py-psutil@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}gobject*>2:devel/py-gobject3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}websockets*>7.:devel/py-websockets@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}sqlalchemy>1.:databases/py-sqlalchemy13@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}psutil>0.:sysutils/py-psutil@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gobject>2:devel/py-gobject3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}websockets>7.:devel/py-websockets@${PY_FLAVOR}
 RUN_DEPENDS=	${COMMON_DEPENDS}
 BUILD_DEPENDS=	${COMMON_DEPENDS}
 
 USES=		desktop-file-utils display:configure gettext gnome python:3.3+
 # DISPLAY must be set at all steps:
 .for t in build install stage
 _USES_$t+=	${_USES_configure}
 .endfor
 USE_GSTREAMER1=	yes
 USE_PYTHON=	distutils autoplist
 USE_GNOME=	gtksourceview3:run glib20 gtk30 librsvg2 introspection
 INSTALLS_ICONS=	yes
 PYDISTUTILS_INSTALLNOSINGLE=	nope
 
 .include <bsd.port.mk>
diff --git a/japanese/japana/Makefile b/japanese/japana/Makefile
index cd67464581d0..00f6b8af39a7 100644
--- a/japanese/japana/Makefile
+++ b/japanese/japana/Makefile
@@ -1,32 +1,32 @@
 # Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 
 PORTNAME=	japana
 PORTVERSION=	2.0.6
 PORTREVISION=	1
 CATEGORIES=	japanese www
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Web proxy converting Japanese into Romaji
 
-RUN_DEPENDS=	*p5-Text-Kakasi>=2:japanese/p5-Text-Kakasi \
+RUN_DEPENDS=	ja-p5-Text-Kakasi>=2:japanese/p5-Text-Kakasi \
 		p5-AppConfig>=0:devel/p5-AppConfig \
 		p5-libwww>=0:www/p5-libwww
 
 USES=		perl5 shebangfix
 SHEBANG_FILES=	japana
 
 PLIST_FILES=	bin/${PORTNAME} etc/${PORTNAME}.conf.default \
 		man/man1/${PORTNAME}.1.gz
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' \
 		${WRKSRC}/${PORTNAME}* ${WRKSRC}/default.conf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/default.conf \
 		${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.default
 
 .include <bsd.port.mk>
diff --git a/math/octave-forge-geometry/Makefile b/math/octave-forge-geometry/Makefile
index 0f8f4ce24b4d..a60f68121b64 100644
--- a/math/octave-forge-geometry/Makefile
+++ b/math/octave-forge-geometry/Makefile
@@ -1,28 +1,30 @@
 # Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu>
 
 PORTNAME=	octave-forge-geometry
 PORTVERSION=	4.0.0
 PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	stephen@FreeBSD.org
 COMMENT=	Octave-forge package ${OCTAVE_PKGNAME}
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKDIR}/${OCTSRC}/COPYING
 
+USES=		python:env
+
 # OCTSRC is the name of the directory of the package.
 # It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
 OCTSRC=		${DISTNAME}
 
 WRKSRC=		${WRKDIR}/${OCTSRC}/src
 
-RUN_DEPENDS+=	py*-lxml>=0:devel/py-lxml
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}lxml>=0:devel/py-lxml
 RUN_DEPENDS+=	${TARBALLS_DIR}/matgeom.tar.gz:math/octave-forge-matgeom
 
 .include "${.CURDIR}/../../Mk/bsd.octave.mk"
 
 post-build:
 	cd ${WRKDIR} && ${TAR} cfz ${DISTNAME}.tar.gz ${OCTSRC}
 
 .include <bsd.port.mk>
diff --git a/www/gnome-user-share/Makefile b/www/gnome-user-share/Makefile
index 7a05e418ff70..e35df9b8cda6 100644
--- a/www/gnome-user-share/Makefile
+++ b/www/gnome-user-share/Makefile
@@ -1,39 +1,39 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 #   $MCom: ports/trunk/www/gnome-user-share/Makefile 19970 2014-10-16 08:47:02Z gusi $
 
 PORTNAME=	gnome-user-share
 PORTVERSION=	3.14.0
 PORTREVISION=	3
 CATEGORIES=	www deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Personal file-sharing service for the GNOME Desktop
 
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libavahi-client.so:net/avahi-app \
 		libnotify.so:devel/libnotify \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libunique-1.0.so:x11-toolkits/unique
-RUN_DEPENDS=	ap*-mod_dnssd>=0:www/mod_dnssd \
+RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}mod_dnssd>=0:www/mod_dnssd \
 		console-kit-daemon:sysutils/consolekit2
 
 USES=		apache:2.2+ gettext gmake gnome libtool pkgconfig tar:xz xorg
 USE_XORG=	sm
 USE_GNOME=	gnomeprefix gtk30 intlhack nautilus3
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS=	--with-modules-path=${LOCALBASE}/${APACHEMODDIR} \
 		--disable-bluetooth
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
 GLIB_SCHEMAS=	org.gnome.desktop.file-sharing.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/httpd/modules|${LOCALBASE}/${APACHEMODDIR}|g' \
 		${WRKSRC}/data/dav_user_*.conf
 
 .include <bsd.port.mk>